Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 18b865b3c0 fix for musl compile 10 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu