Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 2103c803f6 add missed patches 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu