[tracker: 3/3] Merge branch 'coalesce-support'

[Philip Van Hoof <pvanhoof src gnome org>]

commit ed23d94ae3a023f42622a9e190df802f57e17aff
Merge: 599bb15 e2fd0be
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Dec 22 12:06:55 2009 +0100

    Merge branch 'coalesce-support'

 configure.ac                                       |    1 +
 src/libtracker-data/tracker-sparql-query.vala      |   14 ++++++
 tests/libtracker-data/Makefile.am                  |    1 +
 tests/libtracker-data/functions/Makefile.am        |   13 ++++++
 tests/libtracker-data/functions/data-1.ontology    |   39 +++++++++++++++++
 tests/libtracker-data/functions/data-1.ttl         |   46 ++++++++++++++++++++
 .../functions/functions-property-1.out             |    7 +++
 .../functions/functions-property-1.rq              |    8 +++
 .../functions/functions-tracker-1.out              |    7 +++
 .../functions/functions-tracker-1.rq               |   10 ++++
 .../functions/functions-xpath-1.out                |    4 ++
 .../libtracker-data/functions/functions-xpath-1.rq |    7 +++
 .../functions/functions-xpath-2.out                |    1 +
 .../libtracker-data/functions/functions-xpath-2.rq |    7 +++
 tests/libtracker-data/tracker-sparql-test.c        |    5 ++
 15 files changed, 170 insertions(+), 0 deletions(-)
---