Merge branch 'ontology' of git@gitorious.org:qtcontacts-tracker/qtcontacts-tracker...
authorastojilj <aleksandar.stojiljkovic@nokia.com>
Mon, 1 Mar 2010 04:35:03 +0000 (06:35 +0200)
committerastojilj <aleksandar.stojiljkovic@nokia.com>
Mon, 1 Mar 2010 04:35:03 +0000 (06:35 +0200)
commit650698b1fcd3e9709f0363e18c71634db79dbab9
treed79efd9415d1a0de1eb3911af9688368bb69b31d
parent759309cb31db47453cf519431c464c02dd3896f6
parent55b31b75ce36671848e5b327431a6af99b6b1262
Merge branch 'ontology' of git@gitorious.org:qtcontacts-tracker/qtcontacts-tracker into ontology

Conflicts:
qtrackercontactasyncrequest.cpp
qtrackercontactasyncrequest.cpp