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

[Martyn James Russell <mr src gnome org>]

commit ddfe7653282c8dd49d5c7aaa0803b75db038dce2
Merge: 40b6c8b e888903
Author: Jürg Billeter <j bitron ch>
Date:   Tue Sep 15 10:19:49 2009 +0200

    Merge branch 'master' into harmattan

 configure.ac                                   |    6 -
 data/ontologies/11-rdf.ontology                |    5 +
 data/ontologies/39-mto.ontology                |    2 +
 po/es.po                                       | 1051 ++++++++++++++----------
 python/gtk-sparql/gtk-sparql.py                |    7 +-
 python/gtk-sparql/tracker_completion.py        |    7 +-
 src/libtracker-common/tracker-keyfile-object.c |    2 +
 src/libtracker-data/libtracker-data.vapi       |    1 +
 src/libtracker-data/tracker-data-manager.c     |    2 +-
 src/libtracker-data/tracker-data-update.c      |   23 +-
 src/libtracker-data/tracker-data-update.h      |    1 +
 src/libtracker-data/tracker-sparql-query.vala  |   49 +-
 src/libtracker-miner/tracker-crawler.c         |  144 ++--
 src/libtracker-miner/tracker-crawler.h         |    3 +
 src/libtracker-miner/tracker-marshal.list      |    1 +
 src/libtracker-miner/tracker-miner-fs.c        |   63 ++-
 src/libtracker-miner/tracker-miner-fs.h        |    3 +
 src/libtracker-miner/tracker-miner.c           |   57 ++-
 src/libtracker-miner/tracker-miner.h           |   10 +-
 src/plugins/evolution/Makefile.am              |    1 -
 src/plugins/kmail/Makefile.am                  |    1 -
 src/tracker-miner-fs/tracker-miner-files.c     |  297 +++++++-
 src/tracker-store/Makefile.am                  |    2 -
 23 files changed, 1208 insertions(+), 530 deletions(-)
---