Merge remote-tracking branch 'ry/v0.10'
authorisaacs <i@izs.me>
Sat, 7 Sep 2013 19:31:27 +0000 (14:31 -0500)
committerisaacs <i@izs.me>
Sat, 7 Sep 2013 19:31:27 +0000 (14:31 -0500)

Trivial merge