Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 24 Dec 2011 08:16:54 +0000 (03:16 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 24 Dec 2011 08:16:54 +0000 (03:16 -0500)

Trivial merge