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