tree 8b550be7aa7a46b083595a11db853d64bad93436
parent 3a069ff11b9178a84f560435b2fd22294d839018
parent 21e87c4625f290824f4f05d098e576cda40421ce
author Anthony Liguori <aliguori@us.ibm.com> 1320076827 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1320076827 -0500

Merge remote-tracking branch 'qemu-kvm-tmp/uq/master' into staging