]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 22 Oct 2010 13:02:14 +0000 (08:02 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 22 Oct 2010 13:02:14 +0000 (08:02 -0500)

Trivial merge