Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=12) %!d(string=hai) anos
..
files 2d7666cde2 simplify add_rcconf %!s(int64=12) %!d(string=hai) anos
patches ce99e9214d update to latest upstream version %!s(int64=13) %!d(string=hai) anos
src 6daa792eab change defaults for CONFIG/BUILD/INSTALL styles %!s(int64=16) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=12) %!d(string=hai) anos