Merge remote branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 24 May 2010 14:00:24 +0000 (09:00 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 24 May 2010 14:00:24 +0000 (09:00 -0500)

Trivial merge