Waldemar Brodkorb 070cac9d32 resolve conflict %!s(int64=16) %!d(string=hai) anos
..
patches 070cac9d32 resolve conflict %!s(int64=16) %!d(string=hai) anos
Config.in b5b277f514 add some packages %!s(int64=17) %!d(string=hai) anos
Makefile 070cac9d32 resolve conflict %!s(int64=16) %!d(string=hai) anos