[tracker/harmattan-pre-signal-updates: 367/1380] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit 3bdf09699f59ee000ff4a86e272660909c6708c2
Merge: 5046c25 cea095d
Author: Jürg Billeter <j bitron ch>
Date:   Mon Jun 7 13:41:19 2010 +0200

    Merge branch 'master' into harmattan

 configure.ac                                       |    2 -
 data/icons/scalable/Makefile.am                    |    2 +-
 data/ontologies/11-rdf.ontology                    |    5 +
 data/ontologies/91-maemo.ontology                  |    3 +-
 docs/reference/Makefile.am                         |    1 -
 docs/reference/libtracker-common/.gitignore        |    1 -
 docs/reference/libtracker-common/Makefile.am       |   64 -
 .../libtracker-common/libtracker-common-docs.sgml  |   73 -
 .../libtracker-common-sections.txt                 |  228 ---
 .../libtracker-common/libtracker-common.types      |    5 -
 docs/reference/libtracker-common/version.xml.in    |    1 -
 po/es.po                                           |  231 ++--
 po/hu.po                                           | 1464 ++++++++++----------
 src/libtracker-data/libtracker-data.vapi           |    6 +-
 src/libtracker-data/tracker-data-manager.c         |   46 +-
 src/libtracker-data/tracker-data-update.c          |    3 -
 src/libtracker-data/tracker-property.c             |   28 +
 src/libtracker-data/tracker-property.h             |    3 +
 src/libtracker-data/tracker-sparql-query.vala      |   39 +-
 src/libtracker-data/tracker-sparql-scanner.vala    |   13 +-
 src/libtracker-data/tracker-turtle-reader.vala     |    2 +-
 src/miners/flickr/Makefile.am                      |    1 +
 src/tracker-extract/tracker-extract-gstreamer.c    |    6 +
 tests/functional-tests/12-transactions.py          |   95 ++
 24 files changed, 1065 insertions(+), 1257 deletions(-)
---