Merge branch 'release/0.4.1' v0.4.1
authorKenneth Reitz <me@kennethreitz.com>
Sun, 22 May 2011 18:16:48 +0000 (14:16 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 22 May 2011 18:16:48 +0000 (14:16 -0400)

Trivial merge