Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
files 2d7666cde2 simplify add_rcconf 12 lat temu
patches 4b44c9db6d security update 12 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu