b13f6683ed
Merge the topic branch we were sharing with kvm-ppc, Paul has also merged it.
Merge the topic branch we were sharing with kvm-ppc, Paul has also merged it.