Merge branch 'v0.10.4-release' into v0.10
authorisaacs <i@izs.me>
Thu, 11 Apr 2013 18:06:37 +0000 (11:06 -0700)
committerisaacs <i@izs.me>
Thu, 11 Apr 2013 18:06:37 +0000 (11:06 -0700)

Trivial merge