Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 7 Jan 2012 22:18:53 +0000 (17:18 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 7 Jan 2012 22:18:53 +0000 (17:18 -0500)

Trivial merge