Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:13:10 +0000 (07:13 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:13:10 +0000 (07:13 -0500)
1  2 
Makefile.target
configure

diff --cc Makefile.target
Simple merge
diff --cc configure
Simple merge