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

[Martyn James Russell <mr src gnome org>]

commit aa167194c0f5cd44ef92ae619cf90235a9a1474b
Merge: 8c8b3ae ea1c51b
Author: Jürg Billeter <j bitron ch>
Date:   Fri May 8 15:54:37 2009 +0200

    Merge branch 'master' into harmattan

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    8 +-
 data/libtracker-gtk.pc.in                          |    2 +-
 ...acker-module-1.0.pc.in => tracker-module.pc.in} |    2 +-
 data/tracker.pc.in                                 |    2 +-
 src/libtracker-common/Makefile.am                  |    2 +-
 src/libtracker-common/tracker-albumart.c           |   28 ++--
 src/libtracker-data/tracker-sparql-query.vala      |    9 +-
 src/libtracker-gtk/Makefile.am                     |    2 +-
 src/libtracker-gtk/tracker-gtk.h                   |   10 +-
 src/libtracker/Makefile.am                         |    4 +-
 src/tracker-extract/tracker-extract-mp3.c          |  197 +++++++++++---------
 src/tracker-extract/tracker-extract.c              |   21 ++-
 src/tracker-indexer/Makefile.am                    |    2 +-
 .../tracker-search-tool-callbacks.c                |    2 +-
 src/tracker-search-tool/tracker-search-tool.c      |    2 +-
 tests/libtracker-common/.gitignore                 |    1 +
 utils/albumart/albumart-strip.c                    |   12 +-
 18 files changed, 179 insertions(+), 129 deletions(-)
---