Waldemar Brodkorb 18cb3f5227 resolve merge conflict 13 lat temu
..
patches 15c84adca9 fix packages to be compile with stack protector 13 lat temu
Makefile 18cb3f5227 resolve merge conflict 13 lat temu