Merge branch 'v0.8.3-release' into v0.8
authorisaacs <i@izs.me>
Thu, 19 Jul 2012 17:19:04 +0000 (10:19 -0700)
committerisaacs <i@izs.me>
Thu, 19 Jul 2012 17:19:04 +0000 (10:19 -0700)

Trivial merge