Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 777ba90340 fix musl compile 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu