Merge branch 'v0.10.5-release' into v0.10
authorisaacs <i@izs.me>
Tue, 23 Apr 2013 21:07:09 +0000 (14:07 -0700)
committerisaacs <i@izs.me>
Tue, 23 Apr 2013 21:07:09 +0000 (14:07 -0700)

Trivial merge