Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos
..
patches 838ba34414 make MacOS X works as build system for most of the packages, update some packages to latest stable upstream version %!s(int64=15) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos