Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches ff449c57c5 update and fix build 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu