Merge branch 'master' of git@gitorious.org:qtcontacts-tracker/qtcontacts-tracker
authorSiraj Razick <siraj.razick@collabora.co.uk>
Mon, 1 Feb 2010 15:46:33 +0000 (21:16 +0530)
committerSiraj Razick <siraj.razick@collabora.co.uk>
Mon, 1 Feb 2010 15:52:16 +0000 (21:22 +0530)
commit86c8d8ecbe285324bf87850113b857d21a7ec958
tree25dffff9d0ce3e94a08ec19698ebe5db98857ccb
parente42b1855a4f49e1efc68818d389c2692ed3c11f3
parent7f5952580eba6e137f8cd6ccd732a9dca105422c
Merge branch 'master' of git@gitorious.org:qtcontacts-tracker/qtcontacts-tracker

Conflicts:
qtrackercontactasyncrequest.cpp
qtrackercontactasyncrequest.cpp
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp