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

[Martyn James Russell <mr src gnome org>]

commit 15ef44377d716af1532ae7a878ac2e0769f640ad
Merge: 515747d da7bbc2
Author: Jürg Billeter <j bitron ch>
Date:   Thu Jan 28 19:27:39 2010 +0100

    Merge branch 'master' into harmattan

 NEWS                                               |   53 +
 configure.ac                                       |   37 +-
 data/ontologies/10-xsd.description                 |    2 +-
 data/ontologies/30-nie.description                 |    4 +-
 data/ontologies/31-nao.description                 |    2 +-
 data/ontologies/32-nco.description                 |    2 +-
 data/ontologies/33-nfo.description                 |    2 +-
 data/ontologies/34-nmo.description                 |    2 +-
 data/ontologies/35-ncal.description                |    2 +-
 data/ontologies/38-nmm.description                 |    2 +-
 data/ontologies/39-mto.description                 |    2 +-
 data/ontologies/40-mlo.description                 |    2 +-
 docs/ontologies/.gitignore                         |    5 +
 docs/ontologies/README.ontologiesdoc               |   70 +-
 docs/ontologies/explanation.html.template          |   17 -
 docs/ontologies/explanation.xml.template           |   50 +
 docs/ontologies/mfo/explanation.html               |   17 -
 docs/ontologies/mfo/explanation.xml                |   25 +
 docs/ontologies/nie/explanation.html               |  110 -
 docs/ontologies/nie/explanation.xml                |  167 ++
 docs/ontologies/nmm/explanation.html               |   38 -
 docs/ontologies/nmm/explanation.xml                |   54 +
 docs/ontologies/nmo/explanation.html               |   49 -
 docs/ontologies/nmo/explanation.xml                |   62 +
 docs/ontologies/xsd/explanation.html               |   10 -
 docs/ontologies/xsd/explanation.xml                |   16 +
 docs/reference/ontology/.gitignore                 |    5 +
 docs/reference/ontology/Makefile.am                |   12 +-
 docs/reference/ontology/ontology-docs.sgml         |   14 +
 docs/tools/.gitignore                              |    5 +
 docs/tools/Makefile.am                             |   22 +-
 docs/tools/gen-doc.sh                              |    2 +-
 docs/tools/ttl_sgml.c                              |  182 +--
 po/es.po                                           |  200 +-
 po/et.po                                           |  155 +-
 po/hu.po                                           | 2265 +++++++++-----------
 po/sl.po                                           |  193 +-
 src/libtracker-common/tracker-file-utils.c         |   16 +-
 src/libtracker-common/tracker-file-utils.h         |    1 +
 src/libtracker-data/tracker-data-manager.c         |   49 +-
 src/libtracker-data/tracker-data-query.c           |    8 +-
 src/libtracker-data/tracker-data-update.c          |  102 +-
 src/libtracker-data/tracker-sparql-query.vala      |   72 +-
 src/libtracker-db/tracker-db-journal.c             |   22 +-
 src/libtracker-db/tracker-db-manager.c             |   94 +-
 src/libtracker-extract/tracker-exif.c              |   18 +-
 src/libtracker-extract/tracker-iptc.c              |    5 +-
 src/libtracker-extract/tracker-xmp.c               |   24 +-
 src/libtracker-miner/tracker-miner-fs.c            |   64 +-
 src/libtracker-miner/tracker-miner-fs.h            |    2 +
 src/libtracker-miner/tracker-monitor.c             |   32 +-
 src/plugins/evolution/tracker-evolution-plugin.c   |   12 +-
 src/tracker-control/tracker-control.c              |   20 +-
 src/tracker-extract/tracker-extract-jpeg.c         |   34 +-
 src/tracker-extract/tracker-extract-tiff.c         |   53 +-
 src/tracker-miner-fs/tracker-main.c                |   11 +-
 src/tracker-miner-fs/tracker-miner-files-reindex.c |  133 ++-
 src/tracker-miner-fs/tracker-miner-files-reindex.h |    4 +-
 src/tracker-search-tool/tracker-result-grid.gs     |    8 +-
 src/tracker-utils/tracker-search.c                 |    4 +-
 src/tracker-writeback/tracker-writeback-xmp.c      |   16 +-
 tests/libtracker-data/functions/Makefile.am        |    4 +
 tests/libtracker-data/functions/data-3.ontology    |   25 +
 tests/libtracker-data/functions/data-3.ttl         |   22 +
 .../functions/functions-tracker-loc-1.out          |    4 +
 .../functions/functions-tracker-loc-1.rq           |   11 +
 tests/libtracker-data/tracker-sparql-test.c        |    1 +
 tests/tracker-writeback/01-writeback.py            |    4 +-
 utils/services/file-class.cache.test               |   18 +-
 69 files changed, 2604 insertions(+), 2146 deletions(-)
---