]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 11 Oct 2010 20:37:11 +0000 (15:37 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 11 Oct 2010 20:37:11 +0000 (15:37 -0500)

Trivial merge