Merge remote-tracking branch 'ry/v0.8'
authorisaacs <i@izs.me>
Tue, 17 Jul 2012 01:35:07 +0000 (18:35 -0700)
committerisaacs <i@izs.me>
Tue, 17 Jul 2012 01:35:07 +0000 (18:35 -0700)

Trivial merge