Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 4dc2822fa7 resolve merge conflict 15 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu