[tracker/writeback: 6/6] Merge branch 'master' into writeback

[Philip Van Hoof <pvanhoof src gnome org>]

commit d441f27abfac56a9daca508fe993cc713a8436ff
Merge: fc92a18... 5f72ff9...
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Nov 25 13:23:07 2009 +0100

    Merge branch 'master' into writeback

 data/ontologies/38-nmm.ontology            |   18 ++++----
 data/ontologies/41-mfo.ontology            |    7 +++
 docs/ontologies/explanation.html.template  |   11 +++--
 docs/ontologies/index.html                 |    8 +++-
 docs/ontologies/mfo/explanation.html       |   17 +++++++
 docs/ontologies/mfo/feeds-overview.dia     |  Bin 0 -> 5068 bytes
 docs/ontologies/nie/explanation.html       |   67 ++++++++++++++++++++--------
 docs/ontologies/notation.dia               |  Bin 0 -> 2140 bytes
 src/tracker-extract/tracker-extract-jpeg.c |    2 +-
 src/tracker-extract/tracker-extract-pdf.c  |    2 +-
 src/tracker-extract/tracker-extract-png.c  |    2 +-
 src/tracker-extract/tracker-extract-tiff.c |    2 +-
 src/tracker-extract/tracker-xmp.c          |    9 +++-
 utils/services/gen-doc.sh                  |    3 +-
 14 files changed, 107 insertions(+), 41 deletions(-)
---