Merge branch 'v0.8.9-release' into v0.8
authorisaacs <i@izs.me>
Tue, 11 Sep 2012 18:58:35 +0000 (11:58 -0700)
committerisaacs <i@izs.me>
Tue, 11 Sep 2012 18:58:35 +0000 (11:58 -0700)

Trivial merge