]> git.proxmox.com Git - qemu.git/commitdiff
Merge commit 'mst/for_anthony' into mst
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Dec 2009 17:54:39 +0000 (11:54 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Dec 2009 17:54:39 +0000 (11:54 -0600)

Trivial merge