Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
files 2d7666cde2 simplify add_rcconf 12 lat temu
patches 1289dcd07b finetune module selections 14 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu