Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
files 2d7666cde2 simplify add_rcconf 10 lat temu
patches d41b150e8f update to latest upstream version 13 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu