]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 May 2010 15:56:56 +0000 (10:56 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 May 2010 15:56:56 +0000 (10:56 -0500)

Trivial merge