Waldemar Brodkorb 2735fdf973 resolve merge conflict 10 lat temu
..
qemu-sparc 2735fdf973 resolve merge conflict 10 lat temu
toolchain-sparc 2735fdf973 resolve merge conflict 10 lat temu