Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sun, 13 Nov 2011 05:51:40 +0000 (00:51 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 13 Nov 2011 05:51:40 +0000 (00:51 -0500)

Trivial merge