Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches eabdfa9163 remove old patch 11 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu