]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 8 Sep 2010 19:26:14 +0000 (14:26 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 8 Sep 2010 19:26:14 +0000 (14:26 -0500)

Trivial merge