Merge remote branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Apr 2010 20:10:14 +0000 (15:10 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Apr 2010 20:10:14 +0000 (15:10 -0500)

Trivial merge