Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 9fb672a199 update to latest stable upstream 11 lat temu
src 6daa792eab change defaults for CONFIG/BUILD/INSTALL styles 16 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu