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