Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sun, 11 Dec 2011 16:41:42 +0000 (11:41 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 11 Dec 2011 16:41:42 +0000 (11:41 -0500)

Trivial merge