[tracker: 24/24] Merge branch 'mounts-without-volumes'

[Martyn James Russell <mr src gnome org>]

commit 6423a2838d7f637d2a661937277b4b624f2e6d86
Merge: ded355d 5b31f98
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Jun 15 09:59:28 2010 +0100

    Merge branch 'mounts-without-volumes'

 configure.ac                                |    3 +-
 src/libtracker-miner/tracker-miner-fs.c     |  227 +++++++++--
 src/libtracker-miner/tracker-miner-object.c |    7 +-
 src/libtracker-miner/tracker-storage.c      |  559 +++++++++++++--------------
 src/miners/fs/tracker-miner-files.c         |  144 ++++++--
 5 files changed, 581 insertions(+), 359 deletions(-)
---