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

[Martyn James Russell <mr src gnome org>]

commit 03628542cc6c40cf3d06c999cfc1f532829472c3
Merge: c6aa840 7095e31
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Dec 4 21:39:54 2009 +0200

    Merge branch 'master' into harmattan

 NEWS                                               |   64 +
 configure.ac                                       |    4 +-
 data/ontologies/31-nao.ontology                    |    5 +
 data/ontologies/32-nco.ontology                    |   21 +
 data/ontologies/34-nmo.ontology                    |    3 +-
 data/ontologies/91-maemo.ontology                  |   10 +
 docs/reference/Makefile.am                         |    1 +
 docs/reference/libtracker-client/Makefile.am       |   70 +
 .../libtracker-client/libtracker-client-docs.sgml  |   42 +
 .../libtracker-client-sections.txt                 |   91 +
 docs/reference/libtracker-client/version.xml.in    |    1 +
 po/LINGUAS                                         |    1 +
 po/es.po                                           |  680 +-
 po/et.po                                           |   12 +-
 po/nds.po                                          | 1775 +
 src/libtracker-client/tracker.c                    |  185 +-
 src/libtracker-client/tracker.h                    |   56 +-
 src/libtracker-common/libtracker-common.vapi       |    3 -
 src/libtracker-common/tracker-ontology.c           |   76 +-
 src/libtracker-common/tracker-ontology.h           |    6 +-
 src/libtracker-common/tracker-property.c           |    8 +
 src/libtracker-data/tracker-data-manager.c         |   73 +-
 src/libtracker-data/tracker-data-update.c          |   92 +-
 src/libtracker-db/tracker-db-backup.c              |   30 +-
 src/libtracker-db/tracker-db-dbus.c                |   17 +-
 src/libtracker-fts/tracker-fts.c                   |   26 +-
 src/libtracker-miner/tracker-miner-fs.c            |   23 +-
 src/libtracker-miner/tracker-miner.c               |  387 +-
 src/libtracker-miner/tracker-miner.h               |   99 +-
 src/libtracker-miner/tracker-monitor.c             |    5 +-
 src/tracker-extract/tracker-exif.c                 |    8 +-
 src/tracker-miner-fs/tracker-miner-files.c         |    7 +-
 src/tracker-search-bar/Makefile.am                 |    4 +-
 src/tracker-search-bar/tracker-results-window.c    |  267 +-
 src/tracker-search-bar/tracker-utils.c             |  162 +
 src/tracker-search-bar/tracker-utils.h             |   44 +
 src/tracker-store/tracker-statistics.c             |   35 +-
 src/tracker-utils/tracker-tag.c                    |   10 +-
 src/tracker-writeback/tracker-main.c               |    1 +
 tests/functional-tests/tests.xml                   |    6 +-
 utils/data-generators/README                       |   79 +
 utils/data-generators/README.tracker               |   82 -
 utils/data-generators/gen_contacts_messages.py     |  283 -
 utils/data-generators/gen_music.py                 |  161 -
 ...te_and_import.sh => generate-all-and-import.sh} |    8 +-
 utils/data-generators/generate-all.sh              |   26 +
 ...bookmarks.py => generate-data-for-bookmarks.py} |    2 +-
 .../generate-data-for-contact-messages.py          |  263 +
 .../{gen_gossip.py => generate-data-for-gossip.py} |   18 +-
 utils/data-generators/generate-data-for-music.py   |  191 +
 ...bhistory.py => generate-data-for-webhistory.py} |    2 +-
 utils/data-generators/generate-name.py             |  200 +
 utils/data-generators/generate_all.sh              |   22 -
 utils/data-generators/songlist.ttl                 |40000 ++++++++++----------
 utils/services/gen-doc.sh                          |   27 +-
 utils/services/ttl_html.c                          |    7 +
 utils/services/ttl_loader.c                        |   20 +
 utils/services/ttl_model.c                         |    1 +
 utils/services/ttl_model.h                         |    1 +
 59 files changed, 24398 insertions(+), 21405 deletions(-)
---