Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 8207b8d446 another round of updates and musl fixes 11 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu