Merge branch 'v0.10.10-release' into v0.10
authorisaacs <i@izs.me>
Tue, 4 Jun 2013 21:38:10 +0000 (14:38 -0700)
committerisaacs <i@izs.me>
Tue, 4 Jun 2013 21:38:10 +0000 (14:38 -0700)

Trivial merge