Merge branch 'v0.7.6-release'
authorisaacs <i@izs.me>
Tue, 13 Mar 2012 21:03:07 +0000 (14:03 -0700)
committerisaacs <i@izs.me>
Tue, 13 Mar 2012 21:03:07 +0000 (14:03 -0700)

Trivial merge