Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 6d06af04c6 update to latest upstream 10 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu