Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 4dc2822fa7 resolve merge conflict 14 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu