Merge branch 'v0.8.21-release' into v0.8
authorisaacs <i@izs.me>
Mon, 25 Feb 2013 21:51:15 +0000 (13:51 -0800)
committerisaacs <i@izs.me>
Mon, 25 Feb 2013 21:51:15 +0000 (13:51 -0800)

Trivial merge