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

[Martyn James Russell <mr src gnome org>]

commit 04edf19d4a8fe401d41579847ac5d7ad54426639
Merge: 3a14222 fc9d896
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 23 16:10:42 2009 +0100

    Merge branch 'master' into harmattan

 NEWS                                               |   60 +
 configure.ac                                       |    2 +-
 data/db/sqlite-tracker.sql                         |    1 -
 data/ontologies/91-maemo.ontology                  |    6 +
 .../chrome/locale/fr-FR/beagle.dtd                 |   38 +
 .../chrome/locale/fr-FR/beagle.properties          |   22 +
 .../chrome/locale/fr-FR/contents.rdf               |   26 +
 po/de.po                                           | 2917 ++++++++++++--------
 src/libtracker-common/tracker-config-file.c        |    2 +-
 src/libtracker-common/tracker-power-devicekit.c    |    2 +-
 src/libtracker-data/tracker-data-update.c          |  193 +-
 src/libtracker-data/tracker-sparql-query.vala      |  249 +-
 src/libtracker-db/tracker-db-manager.c             |    5 +-
 src/libtracker-miner/tracker-miner-fs.c            |   14 +-
 .../org.freedesktop.Tracker1.Miner.EMails.service  |    2 +-
 src/plugins/evolution/tracker-evolution-plugin.c   |   55 +-
 .../evolution/tracker-miner-emails.desktop.in      |    4 +-
 src/tracker-extract/Makefile.am                    |    2 +
 src/tracker-extract/tracker-extract-msoffice.c     |    6 +-
 src/tracker-extract/tracker-extract-oasis.c        |    6 +-
 src/tracker-extract/tracker-extract-pdf.c          |    7 +-
 src/tracker-extract/tracker-fts-config.c           |  430 +++
 src/tracker-extract/tracker-fts-config.h           |   65 +
 src/tracker-extract/tracker-main.c                 |   11 +
 src/tracker-extract/tracker-main.h                 |    3 +
 src/tracker-search-tool/tracker-search-tool.gs     |   50 +-
 tests/libtracker-data/bnode-coreference/query.rq   |    1 +
 tests/libtracker-data/expr-ops/query-le-1.rq       |    3 +-
 tests/libtracker-data/expr-ops/query-mul-1.rq      |    3 +-
 tests/libtracker-data/expr-ops/query-plus-1.rq     |    3 +-
 30 files changed, 2818 insertions(+), 1370 deletions(-)
---