Merge branch 'timeout' of https://github.com/jgorset/requests into develop
authorKenneth Reitz <me@kennethreitz.com>
Thu, 21 Apr 2011 14:28:26 +0000 (10:28 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 21 Apr 2011 14:28:26 +0000 (10:28 -0400)

Trivial merge