Merge branch 'v0.8.0-release' into v0.8
authorisaacs <i@izs.me>
Mon, 25 Jun 2012 14:57:45 +0000 (07:57 -0700)
committerisaacs <i@izs.me>
Mon, 25 Jun 2012 14:57:45 +0000 (07:57 -0700)

Trivial merge