tree 95121334d97267e1bdf869d181765002d5dbe8e1
parent b5ec5ce0e39d6e7ea707d5604a5f6d567dfd2f48
parent 85199474d0df23b87f0b4a3e330401b59aac3ec0
author Anthony Liguori <aliguori@us.ibm.com> 1266876982 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1266876982 -0600

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