Merge branch 'v0.7.10-release'
authorisaacs <i@izs.me>
Mon, 11 Jun 2012 15:57:32 +0000 (08:57 -0700)
committerisaacs <i@izs.me>
Mon, 11 Jun 2012 15:57:32 +0000 (08:57 -0700)

Trivial merge