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

[Martyn James Russell <mr src gnome org>]

commit b340898013f5854284cd087e443cd7bb122b94bb
Merge: 38cfb8f e5b6448
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Aug 19 19:10:10 2010 +0100

    Merge branch 'master' into harmattan

 NEWS                                           |   40 ++++++++
 configure.ac                                   |   30 +++---
 src/tracker-extract/tracker-extract-msoffice.c |   10 ++-
 tests/functional-tests/.gitignore              |    1 +
 tests/functional-tests/common/Makefile.am      |    2 +
 tests/functional-tests/ttl/Makefile.am         |    6 +-
 tests/tracker-steroids/tracker-test.c          |  120 +++++++++++-------------
 utils/Makefile.am                              |    3 +-
 utils/data-generators/Makefile.am              |    3 +
 utils/data-generators/cc/Makefile.am           |   21 ++++
 10 files changed, 152 insertions(+), 84 deletions(-)
---