Merge commit 'upstream/master'; commit 'origin/master'
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Wed, 3 Nov 2010 05:16:44 +0000 (07:16 +0200)
committerAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Wed, 3 Nov 2010 05:16:44 +0000 (07:16 +0200)
commitc17be8083f1dfe91925c37bbb45c82213907e51e
treee6ed26ffb6bb5553dfa69a6b32cbf7ccf59b84bf
parentb27545bcc7fd80b55c2f9cc314853ca320d4bbc8
parent27c260b5c8eb055506a6ee9508cc8af799c8452e
Merge commit 'upstream/master'; commit 'origin/master'
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.pro