Merge branch 'release/0.9.4'
authorKenneth Reitz <me@kennethreitz.com>
Fri, 18 Feb 2011 08:35:18 +0000 (03:35 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 18 Feb 2011 08:35:18 +0000 (03:35 -0500)

Trivial merge