Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 22c51bbe8c update to latest upstream 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu