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

[Martyn James Russell <mr src gnome org>]

commit 05302902a9cca5084f87a20194da85ebba6a83d0
Merge: 69a294c 6db739e
Author: Jürg Billeter <j bitron ch>
Date:   Tue Dec 29 18:38:19 2009 +0100

    Merge branch 'master' into harmattan

 .gitignore                                         |    1 +
 NEWS                                               |   27 +++
 configure.ac                                       |    2 +-
 docs/reference/ontology/.gitignore                 |    2 +
 docs/tools/.gitignore                              |    5 +
 po/es.po                                           |    3 -
 src/libtracker-common/tracker-utils.c              |  202 ++++++++++++++++++++
 src/libtracker-common/tracker-utils.h              |   12 +-
 src/tracker-extract/tracker-exif.c                 |   92 ++++------
 src/tracker-extract/tracker-extract-jpeg.c         |   62 +++++--
 src/tracker-extract/tracker-extract-libxine.c      |   16 +-
 src/tracker-extract/tracker-extract-oasis.c        |    2 +
 src/tracker-extract/tracker-extract-pdf.c          |    2 +
 src/tracker-extract/tracker-extract-tiff.c         |   67 +++++--
 src/tracker-extract/tracker-extract-vorbis.c       |    3 +
 src/tracker-extract/tracker-iptc.c                 |  157 ++++++++++-----
 src/tracker-extract/tracker-iptc.h                 |    4 +-
 src/tracker-extract/tracker-topanalyzer.cpp        |   20 +-
 src/tracker-extract/tracker-xmp.c                  |    3 +
 src/tracker-writeback/tracker-writeback-xmp.c      |    2 +
 tests/libtracker-data/tracker-ontology-test.c      |   10 +-
 tests/libtracker-data/tracker-sparql-blank-test.c  |    2 +-
 tests/libtracker-data/tracker-sparql-test.c        |   10 +-
 tests/libtracker-fts/tracker-fts-test.c            |   12 +-
 .../tracker-extract/data/jpeg/create_jpeg_testdata |    4 +
 tests/tracker-extract/data/jpeg/iptc_random_1.data |   16 ++
 26 files changed, 552 insertions(+), 186 deletions(-)
---