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