Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 13318ddbb6 fixes for make bulkallmod 15 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu