Merge branch 'master' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 24 Feb 2012 04:51:24 +0000 (23:51 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 24 Feb 2012 04:51:24 +0000 (23:51 -0500)

Trivial merge