Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches e4e8ca04a5 fix musl compile 12 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu