Merge branch 'develop' of github.com:kennethreitz/requests into develop
authorKenneth Reitz <me@kennethreitz.com>
Tue, 24 May 2011 21:18:28 +0000 (17:18 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 24 May 2011 21:18:28 +0000 (17:18 -0400)

Trivial merge