Merge branch 'v0.10.9-release' into v0.10
authorisaacs <i@izs.me>
Thu, 30 May 2013 18:27:50 +0000 (11:27 -0700)
committerisaacs <i@izs.me>
Thu, 30 May 2013 18:27:50 +0000 (11:27 -0700)

Trivial merge