Merge branch 'master' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 22 Oct 2011 22:17:04 +0000 (18:17 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 22 Oct 2011 22:17:04 +0000 (18:17 -0400)

Trivial merge