Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Fri, 1 Apr 2011 18:55:24 +0000 (14:55 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 1 Apr 2011 18:55:24 +0000 (14:55 -0400)

Trivial merge