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