[Inkscape-devel] Merging the Cairo branch