Merge branch 'v0.10.12-release' into v0.10
authorisaacs <i@izs.me>
Tue, 18 Jun 2013 18:13:26 +0000 (11:13 -0700)
committerisaacs <i@izs.me>
Tue, 18 Jun 2013 18:13:26 +0000 (11:13 -0700)

Trivial merge