Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
files 0b3d040567 revert pango update 13 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu