Waldemar Brodkorb 18cb3f5227 resolve merge conflict %!s(int64=13) %!d(string=hai) anos
..
patches 15c84adca9 fix packages to be compile with stack protector %!s(int64=14) %!d(string=hai) anos
Makefile 18cb3f5227 resolve merge conflict %!s(int64=13) %!d(string=hai) anos