Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
commitb45a9b185120a10455859341d8035cce9b441fc8
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Jun 2011 14:03:33 +0000 (15 09:03 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Jun 2011 14:03:33 +0000 (15 09:03 -0500)
treed359072175034e3c5a70314e36c2ee76a8424910
parentf897235e0a0840c44645b609dc52a4c47ddfc3d5
parent3dc769ab43fb4f0e552ecae7ed4414e2b7b77c4b
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging