Merge branch 'v0.6.17-release' into v0.6
authorisaacs <i@izs.me>
Fri, 4 May 2012 20:34:08 +0000 (13:34 -0700)
committerisaacs <i@izs.me>
Fri, 4 May 2012 20:34:08 +0000 (13:34 -0700)

Trivial merge