Merge branch 'release/0.2.2' into develop
authorKenneth Reitz <me@kennethreitz.com>
Mon, 14 Feb 2011 17:59:22 +0000 (12:59 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 14 Feb 2011 17:59:22 +0000 (12:59 -0500)

Trivial merge