Merge branch 'v0.6.19-release' into v0.6
authorisaacs <i@izs.me>
Wed, 6 Jun 2012 16:58:24 +0000 (09:58 -0700)
committerisaacs <i@izs.me>
Wed, 6 Jun 2012 16:58:24 +0000 (09:58 -0700)

Trivial merge