Merge branch 'v0.7.8-release'
authorisaacs <i@izs.me>
Wed, 18 Apr 2012 18:17:15 +0000 (11:17 -0700)
committerisaacs <i@izs.me>
Wed, 18 Apr 2012 18:17:15 +0000 (11:17 -0700)

Trivial merge