Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Wed, 14 Dec 2011 15:43:41 +0000 (10:43 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 14 Dec 2011 15:43:41 +0000 (10:43 -0500)

Trivial merge