Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 12 Dec 2011 16:08:08 +0000 (10:08 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 12 Dec 2011 16:08:08 +0000 (10:08 -0600)
1  2 
configure

diff --cc configure
Simple merge