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

[Martyn James Russell <mr src gnome org>]

commit eecb459d987587d6632135f3521e681fe795cc79
Merge: 5a504d8 25d27c2
Author: Jürg Billeter <j bitron ch>
Date:   Wed May 13 18:11:11 2009 +0200

    Merge branch 'master' into harmattan

 data/ontologies/30-nie.ontology                    |    4 +
 data/ontologies/33-nfo.ontology                    |    1 +
 .../libtracker-common/libtracker-common-docs.sgml  |    6 +-
 .../libtracker-common-sections.txt                 |   51 ++-
 .../libtracker-common/libtracker-common.types      |    3 +-
 src/libstemmer/libstemmer.c                        |   12 +-
 src/libtracker-common/Makefile.am                  |    6 +-
 src/libtracker-common/tracker-albumart.c           |  119 +++--
 src/libtracker-common/tracker-albumart.h           |    6 +-
 src/libtracker-common/tracker-class.c              |    4 -
 src/libtracker-common/tracker-common.h             |    3 +-
 src/libtracker-common/tracker-config.c             |    6 +-
 src/libtracker-common/tracker-hal.h                |   82 ---
 src/libtracker-common/tracker-language.c           |    4 -
 src/libtracker-common/tracker-power-hal.c          |  577 +++++++++++++++++++
 src/libtracker-common/tracker-power.h              |   65 +++
 .../{tracker-hal.c => tracker-storage-hal.c}       |  601 +++++---------------
 src/libtracker-common/tracker-storage.h            |   78 +++
 src/libtracker-data/tracker-sparql-query.vala      |    2 +
 src/tracker-extract/tracker-extract-mp3.c          |    4 +-
 src/tracker-extract/tracker-main.c                 |    6 +-
 src/tracker-extract/tracker-main.h                 |    4 +-
 src/tracker-extract/tracker-xmp.c                  |   10 +-
 src/tracker-indexer/modules/evolution-imap.c       |    5 +
 src/tracker-indexer/tracker-indexer.c              |   58 +-
 src/tracker-search-tool/Makefile.am                |    1 +
 src/tracker-utils/tracker-processes.c              |    4 +-
 src/trackerd/tracker-daemon.c                      |    8 +-
 src/trackerd/tracker-main.c                        |   60 +-
 src/trackerd/tracker-monitor.c                     |    2 +-
 src/trackerd/tracker-processor.c                   |   24 +-
 src/trackerd/tracker-processor.h                   |    4 +-
 src/trackerd/tracker-push-registrar.c              |    4 -
 src/trackerd/tracker-status.c                      |   26 +-
 src/trackerd/tracker-status.h                      |    4 +-
 35 files changed, 1093 insertions(+), 761 deletions(-)
---