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