Merge branch 'v0.6.12-release' into v0.6
authorisaacs <i@izs.me>
Fri, 2 Mar 2012 21:09:00 +0000 (13:09 -0800)
committerisaacs <i@izs.me>
Fri, 2 Mar 2012 21:09:00 +0000 (13:09 -0800)

Trivial merge