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 2d3aaf1664 rename symbol and remove old orig patch files %!s(int64=15) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos