Merge branch 'master' into develop
authorKenneth Reitz <me@kennethreitz.com>
Wed, 19 Oct 2011 20:36:12 +0000 (16:36 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 19 Oct 2011 20:36:12 +0000 (16:36 -0400)

Trivial merge