Merge pull request #196 from pyos/patch-2
authorKenneth Reitz <me@kennethreitz.com>
Wed, 12 Oct 2011 13:34:44 +0000 (06:34 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 12 Oct 2011 13:34:44 +0000 (06:34 -0700)
Fix errors introduced by merging an outdated pull request.


Trivial merge