]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 7 Nov 2011 16:57:27 +0000 (10:57 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 7 Nov 2011 16:57:27 +0000 (10:57 -0600)

Trivial merge