[tracker: 15/15] Merge branch 'miner-userguide-master'

[Martyn James Russell <mr src gnome org>]

commit 503503b34ad64154768f8c66342f40ffd6ba0638
Merge: 4069660 607927e
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Nov 25 14:30:30 2011 +0000

    Merge branch 'miner-userguide-master'

 configure.ac                                       |    7 +
 data/dbus/Makefile.am                              |    7 +
 ...reedesktop.Tracker1.Miner.Userguides.service.in |    3 +
 data/miners/Makefile.am                            |    6 +
 data/miners/tracker-miner-userguides.desktop.in.in |    6 +
 src/miners/fs/Makefile.am                          |   16 +-
 src/miners/fs/tracker-config.c                     |    6 +
 src/miners/fs/tracker-main.c                       |   56 ++-
 src/miners/fs/tracker-miner-applications.c         |   10 +-
 ...pplications-locale.c => tracker-miner-locale.c} |   33 +-
 ...pplications-locale.h => tracker-miner-locale.h} |   10 +-
 ...lications-meego.cpp => tracker-miner-meego.cpp} |   11 +-
 ...-applications-meego.h => tracker-miner-meego.h} |   12 +-
 src/miners/fs/tracker-miner-userguides.c           |  784 ++++++++++++++++++++
 src/miners/fs/tracker-miner-userguides.h           |   54 ++
 15 files changed, 983 insertions(+), 38 deletions(-)
---