Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 rokov pred
..
patches 669e327275 update to latest upstream 12 rokov pred
Makefile f14c1fc551 resolve merge conflict 12 rokov pred