Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos
..
src 6a40cb118c fix eglibc compile %!s(int64=12) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos