Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 12 Nov 2011 18:01:42 +0000 (10:01 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 12 Nov 2011 18:01:42 +0000 (10:01 -0800)

Trivial merge