Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
files 2d7666cde2 simplify add_rcconf %!s(int64=10) %!d(string=hai) anos
patches 1289dcd07b finetune module selections %!s(int64=12) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos