[tracker/harmattan: 410/2240] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit 70b1ea71eb670deb7c61482127c8a70d8d6e2cda
Merge: eb84f6f 576d1c8
Author: Jürg Billeter <j bitron ch>
Date:   Wed Jul 22 10:43:08 2009 +0200

    Merge branch 'master' into harmattan

 data/ontologies/20-dc.ontology                |    1 -
 data/ontologies/30-nie.ontology               |    2 -
 data/ontologies/34-nmo.ontology               |   13 ++-
 src/libtracker-common/tracker-thumbnailer.c   |    2 +
 src/libtracker-data/tracker-data-manager.c    |    2 +
 src/libtracker-data/tracker-turtle.c          |    3 +-
 src/tracker-store/tracker-main.c              |    4 +-
 src/tracker-store/tracker-store.c             |   16 +-
 tests/libtracker-data/tracker-ontology-test.c |  199 +++++++++++++------------
 tests/libtracker-data/tracker-sparql-test.c   |  201 +++++++++++++------------
 10 files changed, 239 insertions(+), 204 deletions(-)
---