]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'qemu-kvm-tmp/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Oct 2011 13:07:51 +0000 (08:07 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Oct 2011 13:07:51 +0000 (08:07 -0500)

Trivial merge