]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Dec 2011 14:50:47 +0000 (08:50 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Dec 2011 14:50:47 +0000 (08:50 -0600)

Trivial merge