Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 20 Aug 2011 22:26:04 +0000 (18:26 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 20 Aug 2011 22:26:04 +0000 (18:26 -0400)

Trivial merge