]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote branch 'qemu-kvm/uq/master' into HEAD
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 3 May 2010 12:31:37 +0000 (07:31 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 3 May 2010 12:31:37 +0000 (07:31 -0500)

Trivial merge