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

[Philip Van Hoof <pvanhoof src gnome org>]

commit ef4c7dd485b79f6ae0292076a20f71f2f79213d3
Merge: d568b55... 26f0173...
Author: Philip Van Hoof <philip codeminded be>
Date:   Fri Nov 13 12:14:16 2009 +0100

    Merge branch 'master' into writeback
    
    Conflicts:
    	src/libtracker-data/libtracker-data.vapi

 NEWS                                           |   20 +
 configure.ac                                   |    2 +-
 data/ontologies/12-nrl.ontology                |    2 +
 data/ontologies/32-nco.ontology                |    3 +
 data/ontologies/34-nmo.ontology                |    4 +
 po/sl.po                                       |  454 ++++++++++++-----------
 python/rss_reader/main.py                      |   99 ++++--
 python/rss_reader/signaler.py                  |   30 ++-
 python/rss_reader/tracker_backend.py           |   22 +-
 python/rss_reader/zeitgeist_backend.py         |   92 +++++
 src/libtracker-common/libtracker-common.vapi   |    1 +
 src/libtracker-common/tracker-property.c       |   45 +++-
 src/libtracker-common/tracker-property.h       |    5 +
 src/libtracker-data/libtracker-data.vapi       |    2 +-
 src/libtracker-data/tracker-data-manager.c     |   31 ++-
 src/libtracker-data/tracker-data-update.c      |   56 +++-
 src/libtracker-data/tracker-data-update.h      |    2 +-
 src/libtracker-data/tracker-sparql-query.vala  |   77 +++-
 src/libtracker-gtk/tracker-ui.h                |    2 +-
 src/tracker-miner-fs/tracker-config.c          |    2 +-
 src/tracker-search-tool/tracker-search-tool.gs |   18 +
 src/tracker-status-icon/eggaccelerators.c      |    2 +-
 utils/services/data-validator.c                |    5 +-
 23 files changed, 677 insertions(+), 299 deletions(-)
---