Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches d6561e7d59 update to latest upstream version 14 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu