Merge branch 'v0.10.0-release' into v0.10
authorisaacs <i@izs.me>
Mon, 11 Mar 2013 15:49:20 +0000 (08:49 -0700)
committerisaacs <i@izs.me>
Mon, 11 Mar 2013 15:49:20 +0000 (08:49 -0700)

Trivial merge