Merge branch 'v0.6.18-release' into v0.6
authorisaacs <i@izs.me>
Tue, 15 May 2012 17:21:40 +0000 (10:21 -0700)
committerisaacs <i@izs.me>
Tue, 15 May 2012 17:21:40 +0000 (10:21 -0700)

Trivial merge