[tracker: 8/8] Merge branch 'index-optical-disc'

[Martyn James Russell <mr src gnome org>]

commit c6164b1a1aad1e8117a31f735b50ee9551d26cdf
Merge: 32f976f aa7afd8
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Mar 4 18:12:50 2010 +0000

    Merge branch 'index-optical-disc'

 docs/manpages/tracker-miner-fs.cfg.5             |   16 ++-
 src/libtracker-miner/tracker-marshal.list        |    3 +-
 src/libtracker-miner/tracker-storage.c           |  225 +++++++++++++++++++---
 src/libtracker-miner/tracker-storage.h           |   25 ++-
 src/tracker-extract/tracker-albumart.c           |   11 +-
 src/tracker-miner-fs/tracker-config.c            |   52 +++++-
 src/tracker-miner-fs/tracker-config.h            |    3 +
 src/tracker-miner-fs/tracker-miner-files.c       |   55 ++++--
 src/tracker-preferences/tracker-config.vapi      |    1 +
 src/tracker-preferences/tracker-preferences.ui   |   28 +++-
 src/tracker-preferences/tracker-preferences.vala |    9 +
 11 files changed, 368 insertions(+), 60 deletions(-)
---