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

Trivial merge