Merge branch 'v0.8.8-release' into v0.8
authorisaacs <i@izs.me>
Wed, 22 Aug 2012 19:51:53 +0000 (12:51 -0700)
committerisaacs <i@izs.me>
Wed, 22 Aug 2012 19:51:53 +0000 (12:51 -0700)

Trivial merge