>>>>> "Matthias" == Matthias Klose <doko@ubuntu.com> writes: Matthias> The diffs are attached as cp-merge.diff, the outstanding Matthias> files are attached as unmerged.diff. I didn't see unmerged.diff... do you still have this? I think there may be a few other simple-ish merges we could do. Tom