Waldemar Brodkorb 05d715df3a resolve merge conflict 12 lat temu
..
qemu-sh 05d715df3a resolve merge conflict 12 lat temu