Merge remote-tracking branch 'ry/v0.6'
authorisaacs <i@izs.me>
Wed, 18 Apr 2012 19:25:32 +0000 (12:25 -0700)
committerisaacs <i@izs.me>
Wed, 18 Apr 2012 19:25:32 +0000 (12:25 -0700)

Trivial merge