Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Wed, 19 Oct 2011 07:40:39 +0000 (03:40 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 19 Oct 2011 07:40:39 +0000 (03:40 -0400)

Trivial merge