Merge branch 'master' into develop
authorKenneth Reitz <me@kennethreitz.com>
Thu, 20 Oct 2011 15:42:09 +0000 (11:42 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 20 Oct 2011 15:42:09 +0000 (11:42 -0400)

Trivial merge