[tracker/writeback: 14/14] Merge branch 'master' into writeback

[Philip Van Hoof <pvanhoof src gnome org>]

commit d568b557335e43ab109c4f33ea7fe0911b837dfb
Merge: 8a20783... 2c79d7d...
Author: Philip Van Hoof <philip codeminded be>
Date:   Thu Nov 12 12:00:32 2009 +0100

    Merge branch 'master' into writeback

 NEWS                                               |   87 +++++++++++
 configure.ac                                       |    4 +-
 .../libtracker-miner/tmpl/tracker-miner.sgml       |   84 +++++-----
 src/libtracker-common/tracker-ontology.c           |   26 +++
 src/libtracker-common/tracker-ontology.h           |    3 +
 src/libtracker-data/tracker-data-manager.c         |   89 ++++++++---
 src/libtracker-data/tracker-sparql-query.vala      |    1 +
 src/libtracker-data/tracker-sparql-scanner.vala    |    2 +
 src/libtracker-fts/tracker-fts.c                   |   15 +-
 src/libtracker-fts/tracker-parser.c                |    2 +-
 src/libtracker-miner/tracker-miner-fs.c            |   32 ++--
 src/tracker-extract/Makefile.am                    |    2 +-
 .../tracker-extract-gstreamer-helix.c              |   13 +-
 src/tracker-miner-fs/tracker-miner-files.c         |   14 +-
 src/tracker-search-bar/tracker-results-window.c    |  164 +++++++++++---------
 tests/functional-tests/Makefile.am                 |    4 +-
 tests/functional-tests/tests.xml                   |    6 +-
 17 files changed, 367 insertions(+), 181 deletions(-)
---