Comment 10 for bug 680628

Attaching the Cairo patch, to make this bug listed as a bug with patch.