Merge branch 'v0.6.16-release' into v0.6
authorisaacs <i@izs.me>
Mon, 30 Apr 2012 20:15:40 +0000 (13:15 -0700)
committerisaacs <i@izs.me>
Mon, 30 Apr 2012 20:15:40 +0000 (13:15 -0700)

Trivial merge