[tracker: 7/7] Merge branch 'unsupported-ontology-change'

[JÃrg Billeter <juergbi src gnome org>]

commit 8353ff3f9d5be0077f0ecccb3d43080dfa12742f
Merge: a34c0df 9eabf6a
Author: JÃrg Billeter <j bitron ch>
Date:   Tue Sep 13 14:42:20 2011 +0200

    Merge branch 'unsupported-ontology-change'

 src/libtracker-data/tracker-data-manager.c |  186 ++++++++++++++++++---------
 src/libtracker-data/tracker-db-manager.h   |    9 +-
 src/libtracker-data/tracker-property.c     |   59 +++++++++
 src/libtracker-data/tracker-property.h     |    9 +-
 4 files changed, 195 insertions(+), 68 deletions(-)
---