Fix the issue with new uids being send with old or merged data to the plugins (thus creating duplicates).
Fix the issue with new uids being send with old or merged data to
the plugins (thus creating duplicates).



git-svn-id: e31799a7ad59d6ea355ca047c69e0aee8a59fcd3@2270 53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e

ianmartin/opensync,ianmartin/opensync