]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 20 Jan 2011 15:05:37 +0000 (09:05 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 20 Jan 2011 15:05:37 +0000 (09:05 -0600)

Trivial merge