Merge pull request #731 from jorjun/patch-1
authorKenneth Reitz <me@kennethreitz.com>
Wed, 18 Jul 2012 14:44:37 +0000 (07:44 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 18 Jul 2012 14:44:37 +0000 (07:44 -0700)
breaks under python 2.7, without the from __future__ import


Trivial merge