[tracker/tracker-store: 19/19] Merge branch 'master' into tracker-store

[Philip Van Hoof <pvanhoof src gnome org>]

commit 544716f39ab1a534e4852f799454b7a1d914f4e3
Merge: 9aa97dd... d320cb4...
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Jun 8 12:42:04 2009 +0200

    Merge branch 'master' into tracker-store
    
    Conflicts:
    	data/ontologies/35-ncal.ontology
    	docs/manpages/Makefile.am
    	docs/manpages/tracker-thumbnailer.1
    	po/da.po

 configure.ac                                    |   17 +-
 data/ontologies/20-dc.ontology                  |    4 +-
 data/ontologies/32-nco.ontology                 |   34 +-
 data/ontologies/33-nfo.ontology                 |   58 +-
 data/ontologies/35-ncal.ontology                |   42 +-
 data/ontologies/38-nmm.ontology                 |   85 ++-
 docs/manpages/Makefile.am                       |    1 -
 docs/manpages/tracker-thumbnailer.1             |   58 --
 src/libtracker-common/tracker-statement-list.c  |   14 +
 src/libtracker-common/tracker-statement-list.h  |    5 +-
 src/tracker-extract/tracker-extract-gstreamer.c | 1021 +++++++++++------------
 utils/services/Makefile.am                      |   10 +-
 utils/services/data-validator.c                 |  229 +++++
 utils/services/resources/maemo-logo.gif         |  Bin 0 -> 3720 bytes
 utils/services/ttl_html.c                       |    2 +-
 15 files changed, 928 insertions(+), 652 deletions(-)

diff --cc docs/manpages/Makefile.am
index 288483e,a74be8d..498963b
--- a/docs/manpages/Makefile.am
+++ b/docs/manpages/Makefile.am
@@@ -16,8 -16,7 +16,7 @@@ man_MANS = 			
  	tracker-extract.1	\
  	tracker-search.1	\
  	tracker-stats.1		\
 -	trackerd.1		\
 +	tracker-store.1		\
- 	tracker-thumbnailer.1	\
  	tracker-tag.1		\
  	tracker-status.1	\
  	tracker.cfg.5		\