Merge commit 'v0.8.6'
authorKenneth Reitz <me@kennethreitz.com>
Mon, 19 Dec 2011 00:19:14 +0000 (19:19 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 19 Dec 2011 00:19:14 +0000 (19:19 -0500)

Trivial merge