Merge remote branch 'qemu-kvm/uq/master' into pulls
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Mar 2010 15:14:24 +0000 (09:14 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Mar 2010 15:14:24 +0000 (09:14 -0600)

Trivial merge