Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 19 Nov 2011 21:19:40 +0000 (16:19 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 19 Nov 2011 21:19:40 +0000 (16:19 -0500)

Trivial merge