Merge branch 'v0.9.9-release'
authorisaacs <i@izs.me>
Thu, 7 Feb 2013 18:33:54 +0000 (10:33 -0800)
committerisaacs <i@izs.me>
Thu, 7 Feb 2013 18:33:54 +0000 (10:33 -0800)

Trivial merge