Minimise diff against libcroco-0.6.8 (pass 1)
Merge upstream libcroco 0.6.3 changes
moving trunk for module inkscape