Merge branch 'v0.7.4-release'
authorisaacs <i@izs.me>
Wed, 15 Feb 2012 19:37:48 +0000 (11:37 -0800)
committerisaacs <i@izs.me>
Wed, 15 Feb 2012 19:37:48 +0000 (11:37 -0800)

Trivial merge