Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 95a5be2cad fix musl compile 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu