Merge branch 'master' of gitorious.org:qtcontacts-tracker/contactsd
authorSiraj Razick <siraj.razick@collabora.co.uk>
Fri, 30 Jul 2010 08:51:22 +0000 (14:21 +0530)
committerSiraj Razick <siraj.razick@collabora.co.uk>
Fri, 30 Jul 2010 08:51:22 +0000 (14:21 +0530)
commitf7135e431aa63040bacf22803825ccfbdfb08e40
tree28e835e2f7ec3eec6c2ecc0e142eff0976e8ea1b
parentbde0b4822238e0e32d906e9901140db85edfb82d
parent6f0987cdbbc3a5368440f15534ea20ecba15d6d3
Merge branch 'master' of gitorious.org:qtcontacts-tracker/contactsd