upstream/2.2.1

Mathias Behrle

@mbehrle

c991b136 · Adding upstream version 2.2.1. · Dec 26, 2011

Tagging upstream version 2.2.1.