upstream/2+20070601 protected

Daniel Baumann

@daniel

46946694 · Adding upstream version 2+20070429. · Sep 11, 2008

Tagging upstream version 2+20070601.