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

[Martyn James Russell <mr src gnome org>]

commit 2cf2246f0df6868a2925e146ed77445090e13f2b
Merge: 5d3de5f 65ead60
Author: Jürg Billeter <j bitron ch>
Date:   Wed May 6 16:51:03 2009 +0200

    Merge branch 'master' into harmattan

 configure.ac                                       |    2 +-
 data/ontologies/34-nmo.ontology                    |   14 ++-
 po/es.po                                           |    1 -
 po/it.po                                           |    1 -
 src/libtracker-common/tracker-hal.c                |   39 ++---
 src/libtracker-data/tracker-sparql-query.vala      |    2 +-
 src/plugins/evolution/Makefile.am                  |    1 +
 src/plugins/evolution/tracker-evolution-indexer.c  |  145 ++++++++--------
 src/plugins/kmail/Makefile.am                      |    1 +
 src/plugins/rss/Makefile.am                        |    1 +
 src/tracker-extract/tracker-extract.c              |   12 +-
 src/tracker-extract/tracker-main.c                 |   16 ++-
 src/tracker-indexer/tracker-indexer.c              |   23 +++-
 src/tracker-indexer/tracker-removable-device.c     |   46 ++++-
 src/trackerd/tracker-status.c                      |  181 +++++++++++++++-----
 tests/libtracker-common/Makefile.am                |   15 ++-
 tests/libtracker-common/mock-dbus-gproxy.c         |   61 +++++++
 tests/libtracker-common/mock-dbus-gproxy.h         |   54 ++++++
 tests/libtracker-common/mock-thumbnailer-dbus.c    |   80 +++++++++
 tests/libtracker-common/tracker-thumbnailer-test.c |  186 ++++++++++++++++++++
 tests/libtracker-data/Makefile.am                  |    4 +-
 21 files changed, 719 insertions(+), 166 deletions(-)
---