Merge branch 'json-api-v0.6' into v0.6
authorisaacs <i@izs.me>
Thu, 1 Mar 2012 00:05:18 +0000 (16:05 -0800)
committerisaacs <i@izs.me>
Thu, 1 Mar 2012 00:05:18 +0000 (16:05 -0800)

Trivial merge