Merge branch 'release/0.6.3' v0.6.3
authorKenneth Reitz <me@kennethreitz.com>
Fri, 14 Oct 2011 01:33:55 +0000 (21:33 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 14 Oct 2011 01:33:55 +0000 (21:33 -0400)

Trivial merge