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

[Martyn James Russell <mr src gnome org>]

commit 0c6965326428f13c82dec487b31e8336c0a4cc75
Merge: b4d47e0 b6a1600
Author: Jürg Billeter <j bitron ch>
Date:   Fri May 22 19:18:24 2009 +0200

    Merge branch 'master' into harmattan

 data/ontologies/11-rdf.ontology                 |    7 +
 data/ontologies/32-nco.ontology                 |    1 -
 data/ontologies/90-tracker.ontology             |    7 +-
 po/et.po                                        |  881 +++----------------
 po/hu.po                                        | 1060 +++++++++--------------
 src/libtracker-common/tracker-power-hal.c       |  106 +--
 src/libtracker-common/tracker-power.h           |    5 +-
 src/libtracker-data/tracker-data-manager.c      |    4 +-
 src/libtracker-data/tracker-data-update.c       |   24 +-
 src/libtracker-db/tracker-db-interface-sqlite.c |   23 +-
 src/libtracker-db/tracker-db-manager.c          |   20 -
 src/libtracker-db/tracker-db-manager.h          |    1 -
 src/tracker-extract/tracker-extract-albumart.c  |   50 +-
 src/tracker-extract/tracker-extract-albumart.h  |    1 +
 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/tracker-indexer.c           |   14 +-
 src/trackerd/tracker-main.c                     |    3 +-
 src/trackerd/tracker-processor.c                |   11 +-
 src/trackerd/tracker-status.c                   |   47 +-
 21 files changed, 728 insertions(+), 1611 deletions(-)
---