]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 29 Jul 2011 14:46:16 +0000 (09:46 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 29 Jul 2011 14:46:16 +0000 (09:46 -0500)
1  2 
configure

diff --cc configure
Simple merge