Conflicts: common.pri contacts/details/distribution.policy.s60 contacts/distribution.policy.s60 contacts/engines/distribution.policy.s60 contacts/filters/distribution.policy.s60 contacts/requests/distribution.policy.s60 distribution.policy.s60 doc/distribution.policy.s60 doc/html/distribution.policy.s60 doc/html/images/distribution.policy.s60 doc/src/distribution.policy.s60 doc/src/examples/distribution.policy.s60 doc/src/images/distribution.policy.s60 doc/src/snippets/distribution.policy.s60 doc/src/snippets/qtcontactsdocsample/distribution.policy.s60 examples/distribution.policy.s60 examples/samplephonebook/distribution.policy.s60 examples/testmodel/distribution.policy.s60 examples/versittest/distribution.policy.s60 examples/versittest/testvcards/distribution.policy.s60 features/distribution.policy.s60 plugins/contacts/distribution.policy.s60 plugins/contacts/symbian/distribution.policy.s60 plugins/contacts/symbian/inc/distribution.policy.s60 plugins/contacts/symbian/internal/distribution.policy.s60 plugins/contacts/symbian/internal/doxygen/distribution.policy.s60 plugins/contacts/symbian/rss/distribution.policy.s60 plugins/contacts/symbian/src/distribution.policy.s60 plugins/contacts/symbian/tsrc/distribution.policy.s60 plugins/contacts/symbian/tsrc/performance/distribution.policy.s60 plugins/contacts/symbian/tsrc/tst_details/distribution.policy.s60 plugins/contacts/symbian/tsrc/ut_cntfiltering/distribution.policy.s60 plugins/contacts/symbian/tsrc/ut_cntrelationship/distribution.policy.s60 plugins/contacts/symbian/tsrc/ut_cntsymbiandatabase/distribution.policy.s60 plugins/contacts/symbian/tsrc/ut_cntsymbianengine/distribution.policy.s60 plugins/contacts/symbian/tsrc/ut_transformcontactdata/distribution.policy.s60 plugins/distribution.policy.s60 tests/auto/distribution.policy.s60 tests/auto/qcontact/distribution.policy.s60 tests/auto/qcontactactions/distribution.policy.s60 tests/auto/qcontactactions/sendemailaction/distribution.policy.s60 tests/auto/qcontactactions/unittest/distribution.policy.s60 tests/auto/qcontactasync/distribution.policy.s60 tests/auto/qcontactasync/maliciousplugin/distribution.policy.s60 tests/auto/qcontactasync/unittest/distribution.policy.s60 tests/auto/qcontactdetail/distribution.policy.s60 tests/auto/qcontactdetaildefinition/distribution.policy.s60 tests/auto/qcontactdetails/distribution.policy.s60 tests/auto/qcontactfilter/distribution.policy.s60 tests/auto/qcontactmanager/distribution.policy.s60 tests/auto/qcontactmanagerfiltering/distribution.policy.s60 tests/auto/qcontactmanagerplugins/distribution.policy.s60 tests/auto/qcontactmanagerplugins/dummyotherplugin/distribution.policy.s60 tests/auto/qcontactmanagerplugins/dummyplugin/distribution.policy.s60 tests/auto/qcontactmanagerplugins/dummyplugincopy/distribution.policy.s60 tests/auto/qcontactmanagerplugins/dummypluginempty/distribution.policy.s60 tests/auto/qcontactmanagerplugins/dummyplugininvalid/distribution.policy.s60 tests/auto/qcontactmanagerplugins/dummypluginmemory/distribution.policy.s60 tests/auto/qcontactmanagerplugins/unittest/distribution.policy.s60 tests/auto/versit/distribution.policy.s60 tests/distribution.policy.s60 tests/profiler/distribution.policy.s60 versit/distribution.policy.s60