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

[Martyn James Russell <mr src gnome org>]

commit 903067955aef9c0898094d379e6560dc9d31117c
Merge: 859546b b3932cc
Author: Jürg Billeter <j bitron ch>
Date:   Thu May 28 16:29:34 2009 +0200

    Merge branch 'master' into harmattan

 data/ontologies/35-ncal.ontology                   |    4 +-
 po/da.po                                           | 1341 +++++++++++---------
 src/libtracker-data/tracker-turtle.c               |   13 +-
 src/libtracker/tracker.c                           |   53 +-
 src/libtracker/tracker.h                           |    2 +
 .../tracker-extract-gstreamer-helix.c              |    4 +-
 src/tracker-extract/tracker-extract-playlist.c     |    6 +-
 src/tracker-indexer/modules/evolution-common.h     |   15 +-
 src/tracker-indexer/modules/evolution.c            |   36 +-
 9 files changed, 862 insertions(+), 612 deletions(-)
---