[tracker: 4/4] Merge branch 'config-rewrite-on-start'

[Martyn James Russell <mr src gnome org>]

commit 455f97c274897696210f773e4cf2523d4be279c3
Merge: 9ee0cc7 169426d
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jul 25 13:37:59 2013 +0100

    Merge branch 'config-rewrite-on-start'

 docs/manpages/tracker-preferences.1         |   16 +-
 src/libtracker-common/tracker-config-file.c |   65 ++++-
 src/libtracker-common/tracker-config-file.h |   17 +-
 src/miners/fs/tracker-config.c              |  440 ++++++++-------------------
 src/miners/fs/tracker-config.h              |   35 ---
 5 files changed, 196 insertions(+), 377 deletions(-)
---