tree e246e96bdfffbc5e07682c5a39ea7a65482a5935
parent 630ecca0da959e65acad1ee0bf3a631bbb7ee052
parent 0ec329dab938e2d97d12a91f8ed15fec27b325e0
author Anthony Liguori <aliguori@us.ibm.com> 1297867627 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1297867627 -0600

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