upstream/2.2.0

Mathias Behrle

@mbehrle

44265d54 · Adding upstream version 2.2.0. · Oct 31, 2011

Tagging upstream version 2.2.0.