Comment 14 for bug 494481

I've had a look at cairo-dock and cairo-dock-plug-ins branches as requested. Unfortunately the current branches have been extensively committed to in ways that the automatic importer cannot process, principally involving not maintaining a clean separation between upstream and packaging revisions. It is not obvious what should be done to fix them. I think we might need to discard the manually committed revisions.