Merge branch 'master' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 15 Apr 2011 22:00:37 +0000 (18:00 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 15 Apr 2011 22:00:37 +0000 (18:00 -0400)

Trivial merge