tree e30d3fa13835c4886eb48f2ca7426e0b8d4bd852
parent 8acbc9b21d757a6be4f8492e547b8159703a0547
parent bfc2455ddbb41148494a084d15777e6bed7533c3
author Anthony Liguori <aliguori@us.ibm.com> 1318252071 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1318252071 -0500

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