Merge branch 'release/0.3.4' v0.3.4
authorKenneth Reitz <me@kennethreitz.com>
Sat, 14 May 2011 18:31:24 +0000 (14:31 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 14 May 2011 18:31:24 +0000 (14:31 -0400)

Trivial merge