Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 5b58272278 fix musl compile 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu