This brings in one commit that we may want to share with the kvm-ppc tree, to avoid merge conflicts and get wider testing.
