]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 26 Oct 2011 15:29:24 +0000 (10:29 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 26 Oct 2011 15:29:24 +0000 (10:29 -0500)

Trivial merge