Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches bd015df1e4 add lxde components, update libpng and firefox 13 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu