[tracker/writeback: 21/22] Merge branch 'master' into writeback

[Philip Van Hoof <pvanhoof src gnome org>]

commit a60a33cde79a6b5975c470b6c83549f2162c90bf
Merge: bc69741... 8fc16ba...
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Nov 17 10:34:55 2009 +0100

    Merge branch 'master' into writeback

 data/ontologies/10-xsd.description         |   11 +
 data/ontologies/11-rdf.description         |   11 +
 data/ontologies/12-nrl.description         |   11 +
 data/ontologies/20-dc.description          |   11 +
 data/ontologies/30-nie.description         |   17 +
 data/ontologies/31-nao.description         |   11 +
 data/ontologies/31-nao.ontology            |    3 +-
 data/ontologies/32-nco.description         |   12 +
 data/ontologies/33-nfo.description         |    1 +
 data/ontologies/34-nmo.description         |   12 +
 data/ontologies/35-ncal.description        |   12 +
 data/ontologies/36-scal.description        |   11 +
 data/ontologies/37-nid3.description        |   11 +
 data/ontologies/38-nmm.description         |    1 +
 data/ontologies/39-mto.description         |    3 +-
 data/ontologies/40-mlo.description         |    1 +
 data/ontologies/41-mfo.description         |   11 +
 data/ontologies/89-mtp.description         |   11 +
 data/ontologies/90-tracker.description     |   11 +
 data/ontologies/91-maemo.description       |   11 +
 docs/ontologies/README.ontologiesdoc       |   22 +
 docs/ontologies/explanation.html.template  |    7 +
 docs/ontologies/nie/explanation.html       |    7 +
 src/libinotify/Makefile.am                 |    3 -
 src/libtracker-data/tracker-data-update.c  |   26 +-
 src/tracker-explorer/tracker-explorer.vala |    2 -
 src/tracker-miner-fs/tracker-miner-files.c |    8 +-
 src/tracker-search-tool/tracker-query.gs   |   11 +-
 src/tracker-search-tool/tracker-utils.gs   |   22 +-
 utils/services/.gitignore                  |    1 +
 utils/services/Makefile.am                 |    9 +-
 utils/services/file-class.cache.test       |  801 ++++++++++++++++++++++++++++
 utils/services/gen-doc.sh                  |    9 +-
 utils/services/qname-test.c                |  140 +++++
 utils/services/qname.c                     |  124 ++++-
 utils/services/qname.h                     |    2 +
 utils/services/ttl2html.c                  |    8 +-
 utils/services/ttl_html.c                  |   28 +-
 utils/services/ttl_html.h                  |    3 +-
 utils/services/ttl_loader.c                |    6 +
 utils/services/ttl_model.h                 |    2 +
 41 files changed, 1380 insertions(+), 44 deletions(-)
---