Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 09fdcb6e5b update to latest upstream version 13 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu