Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'qemu-kvm-tmp/uq/master' into staging