Merge branch 'release/0.3.2'
authorKenneth Reitz <me@kennethreitz.com>
Fri, 15 Apr 2011 21:27:17 +0000 (17:27 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 15 Apr 2011 21:27:17 +0000 (17:27 -0400)

Trivial merge