[tracker/writeback: 22/23] Merge branch 'master' into writeback

[Philip Van Hoof <pvanhoof src gnome org>]

commit 69909a72f0753535cb0cdfd701f6c73a6e05975f
Merge: d8e0293 1c5289e
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Dec 21 12:39:32 2009 +0100

    Merge branch 'master' into writeback

 Makefile.am                                   |    1 +
 NEWS                                          |   41 +
 configure.ac                                  |   28 +-
 data/ontologies/34-nmo.ontology               |    8 +
 data/ontologies/40-mlo.ontology               |   21 +
 docs/Makefile.am                              |    7 +-
 docs/reference/ontology/ontology.png          |  Bin 1187428 -> 0 bytes
 docs/tools/Makefile.am                        |   30 +-
 docs/tools/ontology-graph.c                   |    2 +
 po/POTFILES.in                                |    2 +-
 po/es.po                                      | 1366 +++++++++++++------------
 src/libtracker-db/tracker-db-manager.c        |    5 +-
 src/plugins/nautilus/tracker-tags-extension.c |   23 +-
 src/plugins/nautilus/tracker-tags-view.c      |   22 +-
 src/tracker-extract/tracker-extract-jpeg.c    |   36 +-
 src/tracker-extract/tracker-extract-pdf.c     |   34 +
 src/tracker-extract/tracker-extract-png.c     |   34 +
 src/tracker-extract/tracker-extract-tiff.c    |   34 +
 src/tracker-extract/tracker-xmp.c             |  394 ++++----
 src/tracker-extract/tracker-xmp.h             |    2 +-
 20 files changed, 1182 insertions(+), 908 deletions(-)
---