Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 rokov pred
..
patches d8eb95ffc8 fix build 10 rokov pred
Makefile f14c1fc551 resolve merge conflict 10 rokov pred