Waldemar Brodkorb 2735fdf973 resolve merge conflict 12 lat temu
..
qemu-ppc 2735fdf973 resolve merge conflict 12 lat temu
toolchain-ppc 2735fdf973 resolve merge conflict 12 lat temu