Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Mon, 20 Feb 2012 22:55:17 +0000 (17:55 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 20 Feb 2012 22:55:17 +0000 (17:55 -0500)

Trivial merge