Merge branch 'master' into synctarget 45
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Thu, 4 Nov 2010 06:17:43 +0000 (08:17 +0200)
committerAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Thu, 4 Nov 2010 06:17:43 +0000 (08:17 +0200)
commitb13ade9c949ca05f23f11b0355696d75a5052d29
treefff7bc0a48a6e8ba40e03010a29319a479d1e802
parent3bc17d950edc16ccfa55108003c0a7e389c21bc0
parentce43dcdad525e03068eb0a8c394195c184024410
Merge branch 'master' into synctarget

Conflicts:
src/engine/contactsaverequest.cpp
src/dao/querybuilder.h
src/engine/contactsaverequest.cpp
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp