Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 5ebc8fd6c0 update to latest stable 14 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu