Merge branch 'v0.8.22-release' into v0.8
authorisaacs <i@izs.me>
Thu, 7 Mar 2013 00:19:29 +0000 (16:19 -0800)
committerisaacs <i@izs.me>
Thu, 7 Mar 2013 00:19:29 +0000 (16:19 -0800)

Trivial merge