Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 28 Jul 2012 21:09:21 +0000 (17:09 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 28 Jul 2012 21:09:21 +0000 (17:09 -0400)

Trivial merge