Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
files 2d7666cde2 simplify add_rcconf 11 lat temu
patches 30d2c58211 fix compile, reported by joern, update to latest upstream 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu