[tracker/urho-sync: 8/9] Merge branch 'master' into urho-sync

[Philip Van Hoof <pvanhoof src gnome org>]

commit 2ef24a4563c2e6fab6f17b0a1926602135639cb4
Merge: a7a7339... 8a66865...
Author: Philip Van Hoof <philip codeminded be>
Date:   Thu Aug 20 10:56:00 2009 +0200

    Merge branch 'master' into urho-sync

 data/ontologies/Makefile.am                        |    1 +
 src/libtracker-data/libtracker-data.vapi           |    2 +-
 src/libtracker-data/tracker-data-update.c          |   17 +++--
 src/libtracker-data/tracker-data-update.h          |    3 +-
 src/libtracker-data/tracker-sparql-query.vala      |    2 +-
 src/tracker-miner-fs/Makefile.am                   |    4 +-
 src/tracker-miner-fs/modules/applications.c        |    2 +-
 src/tracker-store/Makefile.am                      |    4 +-
 src/tracker-store/tracker-removable-device.c       |    2 -
 src/tracker-store/tracker-store.c                  |    2 +-
 tests/libtracker-data/tracker-ontology-test.c      |    2 -
 tests/libtracker-data/tracker-sparql-test.c        |    3 +-
 tests/libtracker-data/turtle/Makefile.am           |    6 ++-
 .../turtle/turtle-data-002.ontology                |   62 ++++++++++++++++++++
 tests/libtracker-data/turtle/turtle-data-002.ttl   |   14 +++++
 tests/libtracker-data/turtle/turtle-query-002.rq   |    5 ++
 tests/tracker-miner-fs/Makefile.am                 |    4 +-
 tests/tracker-store/Makefile.am                    |    3 +-
 utils/services/data-validator.c                    |    1 -
 utils/services/ontology-validator.c                |   46 +++++++++++++--
 20 files changed, 149 insertions(+), 36 deletions(-)
---