Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
files 2d7666cde2 simplify add_rcconf 11 lat temu
patches 2ee33f7b7b update to latest upstream version 14 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu