Merge branch 'master' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 20:10:24 +0000 (16:10 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 20:10:24 +0000 (16:10 -0400)

Trivial merge