Merge branch 'v0.10.1-release' into v0.10
authorisaacs <i@izs.me>
Thu, 21 Mar 2013 16:13:45 +0000 (09:13 -0700)
committerisaacs <i@izs.me>
Thu, 21 Mar 2013 16:13:45 +0000 (09:13 -0700)

Trivial merge