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