Merge branch 'chavo' of git@gitorious.org:qtcontacts-tracker/qtcontacts-tracker into...
authorSiraj Razick <siraj.razick@collabora.co.uk>
Thu, 15 Apr 2010 03:47:40 +0000 (09:17 +0530)
committerSiraj Razick <siraj.razick@collabora.co.uk>
Thu, 15 Apr 2010 03:47:40 +0000 (09:17 +0530)
commitdb0ce3da1eaa0113f9c280754e45a61c4a10c149
tree57659449dcbe335ec6a7c8a674e8a3c9fe74190a
parent4fd39a08bb9d01172d84621f32c5dac91abd8030
parent0d1071a04698f3449484933761022a6a7f2a2d5d
Merge branch 'chavo' of git@gitorious.org:qtcontacts-tracker/qtcontacts-tracker into chavo

Conflicts:
src/engine/engine.cpp
src/engine/engine.cpp