Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sun, 27 Nov 2011 15:45:19 +0000 (10:45 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 27 Nov 2011 15:45:19 +0000 (10:45 -0500)

Trivial merge