Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
files 2d7666cde2 simplify add_rcconf 12 lat temu
patches b9982ce464 update to latest upstream 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu