Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches bb9efd2683 update firefox and dependencies 10 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu