[tracker: 4/4] Merge branch 'gsettings-keyfile-bridge'

[Martyn James Russell <mr src gnome org>]

commit 5a28408e0e51df852630619467780781f80c8208
Merge: 5f5fc5d bf7eefb
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Dec 14 11:35:38 2011 +0000

    Merge branch 'gsettings-keyfile-bridge'

 docs/manpages/tracker-extract.1                |    5 +
 docs/manpages/tracker-miner-fs.1               |    7 ++
 docs/manpages/tracker-store.1                  |    5 +
 docs/reference/libtracker-sparql/overview.sgml |    9 ++
 src/libtracker-common/tracker-config-file.c    |  136 ++++++++++++++++++++++--
 5 files changed, 151 insertions(+), 11 deletions(-)
---