Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos
..
patches 179597b65e fix lemote yeelong compile %!s(int64=12) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos