Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=12) %!d(string=hai) anos
..
patches c37b25dfca convert to autotool infrastructure %!s(int64=13) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=12) %!d(string=hai) anos