Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
files 2d7666cde2 simplify add_rcconf 10 lat temu
patches 74571217d4 add missing patch 10 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu