Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 854670adfd fix build 10 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu