Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 02:14:15 +0000 (22:14 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 02:14:15 +0000 (22:14 -0400)

Trivial merge