Merge branch 'release/0.4.0' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 15 May 2011 03:58:07 +0000 (23:58 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 15 May 2011 03:58:07 +0000 (23:58 -0400)

Trivial merge