Merge branch 'ppc-for-upstream' of git://github.com/agraf/qemu