Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches d6ce7a9b7c added log4cxx 13 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu