Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
files 2d7666cde2 simplify add_rcconf 10 lat temu
patches f5a04bbc6e hudson says: you forgot the patches 10 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu