]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 17 May 2010 18:17:34 +0000 (13:17 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 17 May 2010 18:17:34 +0000 (13:17 -0500)

Trivial merge