Merge branch 'v0.6-merge'
authorisaacs <i@izs.me>
Sat, 5 May 2012 00:24:30 +0000 (17:24 -0700)
committerisaacs <i@izs.me>
Sat, 5 May 2012 00:24:30 +0000 (17:24 -0700)

Trivial merge