Waldemar Brodkorb 32a82e3867 resolve conflicts %!s(int64=11) %!d(string=hai) anos
..
patches 713dc7012a fix make bulk on OpenADK buildserver %!s(int64=13) %!d(string=hai) anos
Makefile 32a82e3867 resolve conflicts %!s(int64=11) %!d(string=hai) anos