Merge branch 'release/0.2.1' v0.2.1
authorKenneth Reitz <me@kennethreitz.com>
Mon, 14 Feb 2011 15:46:40 +0000 (10:46 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 14 Feb 2011 15:46:40 +0000 (10:46 -0500)

Trivial merge