Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 2b81597be0 remove wrong patch file 11 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu