]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 21:45:17 +0000 (16:45 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 21:45:17 +0000 (16:45 -0500)
1  2 
configure

diff --cc configure
Simple merge