Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 3ceb8d28c9 fix musl compile 13 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu