[tracker: 27/27] Merge branch 'hierarchical-indexing'

[Martyn James Russell <mr src gnome org>]

commit 514206249c4af84e678992ec81838fb0a79128f5
Merge: edc322f 095c179
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Feb 19 12:13:08 2010 +0000

    Merge branch 'hierarchical-indexing'

 src/libtracker-client/tracker-sparql-builder.vala |    1 +
 src/libtracker-miner/tracker-crawler.c            |  458 +++++++++------
 src/libtracker-miner/tracker-crawler.h            |   14 +-
 src/libtracker-miner/tracker-marshal.list         |    2 +-
 src/libtracker-miner/tracker-miner-fs.c           |  664 ++++++++++++++++-----
 src/libtracker-miner/tracker-miner-fs.h           |    5 +
 src/libtracker-miner/tracker-miner-manager.c      |    5 -
 src/tracker-control/tracker-control.c             |    5 -
 src/tracker-extract/tracker-extract.c             |    2 -
 src/tracker-miner-fs/tracker-miner-files.c        |  116 +++--
 10 files changed, 877 insertions(+), 395 deletions(-)
---