Merge commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f' into eclair-mr2 * commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f': changes from Sync Manager API Review: bug 2164262
Merge commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f' into eclair-mr2 * commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f': changes from Sync Manager API Review: bug 2164262