Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 61629a5271 update to latest upstream version 13 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu