Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 12 Nov 2011 23:35:39 +0000 (18:35 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 12 Nov 2011 23:35:39 +0000 (18:35 -0500)

Trivial merge