Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Wed, 30 Nov 2011 17:45:17 +0000 (12:45 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 30 Nov 2011 17:45:17 +0000 (12:45 -0500)

Trivial merge