Merge commit 'upstream/master'
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Thu, 28 Oct 2010 13:36:51 +0000 (16:36 +0300)
committerAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Thu, 28 Oct 2010 13:36:51 +0000 (16:36 +0300)
commitb27545bcc7fd80b55c2f9cc314853ca320d4bbc8
tree92f66d66e81902cd6d9ec76a58cc6be8896d3849
parent18631d4b7e35f959b9aa4f5e7795dc99f74d7250
parent77a858018d342fdbf2642d5627ce8fc114f2e926
Merge commit 'upstream/master'
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h