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

[Martyn James Russell <mr src gnome org>]

commit bea212dee40f2c163a11582c2eb113c9b6c26446
Merge: cb9396d 561d00d
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jun 17 17:27:16 2010 +0100

    Merge branch 'master' into harmattan

 NEWS                                               |   48 ++
 configure.ac                                       |   47 +-
 data/ontologies/32-nco.ontology                    |    1 -
 data/ontologies/34-nmo.ontology                    |    8 +-
 data/ontologies/90-tracker.ontology                |   10 +
 .../libtracker-miner/libtracker-miner-sections.txt |    4 +
 src/libtracker-data/tracker-data-manager.c         |   46 +-
 src/libtracker-data/tracker-data-query.c           |    2 +-
 src/libtracker-data/tracker-data-update.c          |   50 +-
 src/libtracker-data/tracker-sparql-expression.vala |    5 +-
 src/libtracker-data/tracker-sparql-query.vala      |    2 +
 src/libtracker-db/tracker-db-interface-sqlite.c    |  749 ++++++++------------
 src/libtracker-db/tracker-db-interface-sqlite.h    |   28 +-
 src/libtracker-db/tracker-db-interface.c           |  534 ++-------------
 src/libtracker-db/tracker-db-interface.h           |   90 +--
 src/libtracker-db/tracker-db-manager.c             |   11 +-
 src/libtracker-fts/tracker-parser-glib.c           |  124 +++--
 src/libtracker-fts/tracker-parser-libicu.c         |  241 +++++--
 src/libtracker-fts/tracker-parser-libunistring.c   |  105 ++-
 src/libtracker-fts/tracker-parser-utils.c          |  149 ----
 src/libtracker-fts/tracker-parser-utils.h          |   25 +-
 src/libtracker-miner/tracker-miner-fs.c            |  271 ++++++--
 src/libtracker-miner/tracker-miner-fs.h            |   59 +-
 src/libtracker-miner/tracker-miner-object.c        |    7 +-
 src/libtracker-miner/tracker-storage.c             |  601 +++++++++--------
 src/libtracker-miner/tracker-storage.h             |   64 ++-
 src/miners/fs/tracker-miner-files.c                |  541 ++++++++++++---
 src/tracker-extract/tracker-extract-playlist.c     |    5 +-
 src/tracker-status-icon/tracker-status-icon.c      |   59 +-
 src/tracker-store/tracker-dbus.c                   |    2 +-
 src/tracker-store/tracker-events.c                 |   21 +-
 src/tracker-store/tracker-resource-class.c         |  190 ++++--
 src/tracker-store/tracker-resource-class.h         |    7 +-
 src/tracker-store/tracker-resources.c              |    4 +-
 tests/libtracker-data/tracker-ontology-test.c      |    4 +-
 tests/libtracker-data/tracker-sparql-test.c        |    4 +-
 tests/libtracker-fts/tracker-parser-test.c         |   55 +-
 37 files changed, 2131 insertions(+), 2042 deletions(-)
---