[tracker/tracker-store: 13/13] Merge branch 'master' into tracker-store

[Jürg Billeter <juergbi src gnome org>]

commit 4f56a11819908fb2e44a1232b8596ea442708c9d
Merge: 3c56d94... eb97ae3...
Author: Jürg Billeter <j bitron ch>
Date:   Mon May 25 13:08:12 2009 +0200

    Merge branch 'master' into tracker-store

 data/ontologies/32-nco.ontology                    |    1 -
 src/libtracker-data/tracker-data-update.c          |   18 +++++--
 src/libtracker-db/tracker-db-interface-sqlite.c    |   23 +-------
 src/tracker-extract/tracker-extract-albumart.c     |   50 ++++++++++--------
 src/tracker-extract/tracker-extract-albumart.h     |    1 +
 .../tracker-extract-gstreamer-helix.c              |    4 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |   53 +++++++++++++++++++-
 src/tracker-extract/tracker-extract-mp3.c          |   18 ++++---
 src/tracker-extract/tracker-extract.c              |    3 +-
 src/tracker-indexer/modules/evolution-common.h     |   15 +++---
 src/tracker-indexer/modules/evolution.c            |   36 +++++++++++++-
 src/tracker-indexer/tracker-processor.c            |   11 ++--
 12 files changed, 158 insertions(+), 75 deletions(-)