Merge remote-tracking branch 'ry/v0.8'
authorisaacs <i@izs.me>
Fri, 21 Dec 2012 19:08:32 +0000 (11:08 -0800)
committerisaacs <i@izs.me>
Fri, 21 Dec 2012 19:08:32 +0000 (11:08 -0800)

Trivial merge