Merge branch 'v0.10.7-release' into v0.10
authorisaacs <i@izs.me>
Fri, 17 May 2013 21:37:28 +0000 (14:37 -0700)
committerisaacs <i@izs.me>
Fri, 17 May 2013 21:37:28 +0000 (14:37 -0700)

Trivial merge