Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Tue, 11 Oct 2011 00:07:14 +0000 (20:07 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 11 Oct 2011 00:07:14 +0000 (20:07 -0400)

Trivial merge