[tracker/harmattan-pre-signal-updates: 866/1380] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit 58de011bc956c8560673ce1701b3b1a93a1152bf
Merge: 56623d4 cfd40b6
Author: Jürg Billeter <j bitron ch>
Date:   Mon Aug 2 19:03:18 2010 +0200

    Merge branch 'master' into harmattan

 Makefile.am                                        |    1 -
 configure.ac                                       |    1 +
 po/hu.po                                           |  374 ++++---
 po/sv.po                                           | 1155 +++++++++++---------
 src/libtracker-data/tracker-data-backup.c          |    2 +-
 src/libtracker-data/tracker-db-journal.c           |   17 +
 src/libtracker-data/tracker-sparql-expression.vala |   25 +
 src/libtracker-data/tracker-sparql-scanner.vala    |    6 +
 src/libtracker-miner/tracker-crawler.c             |    9 +-
 src/miners/fs/Makefile.am                          |    3 +
 src/tracker-control/Makefile.am                    |    2 +
 src/tracker-store/tracker-backup.c                 |    4 +-
 src/tracker-store/tracker-dbus.c                   |   93 +-
 src/tracker-store/tracker-dbus.h                   |    2 +-
 src/tracker-store/tracker-main.c                   |   21 +-
 src/tracker-store/tracker-store.c                  |   20 +-
 src/tracker-store/tracker-store.h                  |    2 +
 tests/functional-tests/.gitignore                  |    2 +
 tests/functional-tests/Makefile.am                 |   37 +-
 tests/functional-tests/busy-handling-test.vala     |  164 +++
 tests/functional-tests/configuration.py            |    2 +-
 tests/functional-tests/data/Makefile.am            |    3 +-
 tests/functional-tests/data/Text/Makefile.am       |    8 +
 tests/functional-tests/fts-tc.py                   |  728 ++++++++++++
 tests/functional-tests/mass-storage-mode.py        |  427 ++++----
 tests/functional-tests/tests.xml                   |  722 +++++++-----
 tests/libtracker-data/Makefile.am                  |    3 +
 tests/libtracker-data/algebra/Makefile.am          |    4 +
 tests/libtracker-data/algebra/filter-in-1.out      |    1 +
 tests/libtracker-data/algebra/filter-in-1.rq       |    4 +
 tests/libtracker-data/algebra/filter-in-2.out      |    3 +
 tests/libtracker-data/algebra/filter-in-2.rq       |    4 +
 tests/libtracker-data/tracker-sparql-test.c        |    2 +
 tests/libtracker-fts/Makefile.am                   |    3 +
 tests/libtracker-miner/Makefile.am                 |    6 +-
 35 files changed, 2574 insertions(+), 1286 deletions(-)
---