upstream/6 protected

Daniel Baumann

@daniel

1d877527 · Adding upstream version 6. · Jun 04, 2010

Tagging upstream version 6.