Merge remote branch 'qmp/for-anthony' into staging
commita2da0395c12bd2b26e2180d735c83988ff66a559
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jun 2010 14:39:01 +0000 (14 09:39 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jun 2010 14:39:01 +0000 (14 09:39 -0500)
treeef70ee8d42a24a8c7d7760eac724529d904fb5ea
parent09564574b868f591fb1a9cf426f0c1d64f280431
parent02e95918b82efde24db1d759300ec3c61bd694b3
Merge remote branch 'qmp/for-anthony' into staging
check-qjson.c
json-parser.c