Merge branch 'v0.7.7-release'
authorisaacs <i@izs.me>
Fri, 30 Mar 2012 18:54:08 +0000 (11:54 -0700)
committerisaacs <i@izs.me>
Fri, 30 Mar 2012 18:54:08 +0000 (11:54 -0700)

Trivial merge