Merge branch 'master' into multipleaffiliations
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Wed, 3 Nov 2010 05:17:39 +0000 (07:17 +0200)
committerAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Wed, 3 Nov 2010 05:17:39 +0000 (07:17 +0200)
commitfda4991fe80e5c8a67e2275b862f2e4bbb67daa4
tree70771b10b086cec7b0f9783100e3cdd5c33c5f1b
parentfd7e5e8051d0ef996790e02b4cf3ddb2add24d95
parentc17be8083f1dfe91925c37bbb45c82213907e51e
Merge branch 'master' into multipleaffiliations
src/engine/contactsaverequest.cpp
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp