Merge branch 'release/0.3.3' into develop
authorKenneth Reitz <me@kennethreitz.com>
Thu, 12 May 2011 08:02:18 +0000 (04:02 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 12 May 2011 08:02:18 +0000 (04:02 -0400)

Trivial merge