Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches d8eb95ffc8 fix build 11 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu