Merge branch 'release/0.3.0' v0.3.0
authorKenneth Reitz <me@kennethreitz.com>
Fri, 25 Feb 2011 14:00:23 +0000 (09:00 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 25 Feb 2011 14:00:23 +0000 (09:00 -0500)

Trivial merge