Waldemar Brodkorb 8b3dac771a resolve merge conflict, second try %!s(int64=11) %!d(string=hai) anos
..
patches 0e19731bdf allow gettext-tiny host compile with HOST_STYLE=manual %!s(int64=11) %!d(string=hai) anos
Makefile 8b3dac771a resolve merge conflict, second try %!s(int64=11) %!d(string=hai) anos