Merge commit 'upstream/master'
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Thu, 4 Nov 2010 05:58:38 +0000 (07:58 +0200)
committerAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Thu, 4 Nov 2010 05:58:38 +0000 (07:58 +0200)
commitce43dcdad525e03068eb0a8c394195c184024410
tree0f3bfc7bec7021fcd4868648857c11d161987bf5
parente0ff732f1749a8cdb749c6e76d7d7ebaf0c18771
parent407cebfd8582afed63d9b433d88db015ae65a314
Merge commit 'upstream/master'
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp