Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Wed, 19 Oct 2011 05:31:32 +0000 (01:31 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 19 Oct 2011 05:31:32 +0000 (01:31 -0400)

Trivial merge