Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
files 2d7666cde2 simplify add_rcconf 10 lat temu
patches 42dd254f59 full build on Darwin fixes 12 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu