Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
files 2d7666cde2 simplify add_rcconf 12 lat temu
patches 7decd50174 oops, forgot the patch 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu