Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 9ff776e734 update to latest upstream version 15 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu