Merge branch 'release/0.5.0' v0.5.0
authorKenneth Reitz <me@kennethreitz.com>
Wed, 22 Jun 2011 02:44:02 +0000 (22:44 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 22 Jun 2011 02:44:02 +0000 (22:44 -0400)

Trivial merge