Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 1ee3ae1f9f update to latest upstream 13 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu