]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Apr 2010 01:59:12 +0000 (20:59 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Apr 2010 01:59:12 +0000 (20:59 -0500)

Trivial merge