Merge branch 'release/0.6.4' v0.6.4
authorKenneth Reitz <me@kennethreitz.com>
Fri, 14 Oct 2011 02:23:04 +0000 (22:23 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 14 Oct 2011 02:23:04 +0000 (22:23 -0400)

Trivial merge