Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 5bdd932877 update to latest upstream 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu