Merge branch 'v0.10.2-release' into v0.10
authorisaacs <i@izs.me>
Thu, 28 Mar 2013 20:05:37 +0000 (13:05 -0700)
committerisaacs <i@izs.me>
Thu, 28 Mar 2013 20:05:37 +0000 (13:05 -0700)

Trivial merge