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

[Martyn James Russell <mr src gnome org>]

commit c8bac0771a97034c02550b17eab51d122052f069
Merge: c30194c d467f28
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jan 7 14:15:24 2010 +0000

    Merge branch 'master' into harmattan

 NEWS                                            |   36 +
 README                                          |   13 +-
 configure.ac                                    |   26 +-
 po/de.po                                        | 1767 ++++++++++++-----------
 src/libtracker-common/tracker-language.c        |    4 +
 src/libtracker-data/tracker-data-manager.c      |   17 +-
 src/libtracker-data/tracker-sparql-query.vala   |   10 +
 src/libtracker-data/tracker-sparql-scanner.vala |    7 +-
 src/libtracker-db/tracker-db-journal.c          |    4 +
 src/libtracker-fts/tracker-fts.c                |   28 +-
 src/tracker-extract/tracker-extract-gstreamer.c |   10 +-
 src/tracker-extract/tracker-msword.cpp          |    4 -
 src/tracker-extract/tracker-msword.h            |   10 +-
 tests/common/tracker-test-helpers.c             |    4 +
 14 files changed, 1047 insertions(+), 893 deletions(-)
---