[tracker: 4/4] Merge branch 'tracker-control-with-backup-and-restore'

[Martyn James Russell <mr src gnome org>]

commit 374a2e50d827525fd45bf975fb51e7468274c716
Merge: 3d07aec f964acd
Author: Martyn Russell <martyn lanedo com>
Date:   Thu May 5 10:21:06 2011 +0100

    Merge branch 'tracker-control-with-backup-and-restore'

 docs/manpages/tracker-control.1               |   12 ++
 src/tracker-control/tracker-control-general.c |  193 ++++++++++++++++++++++++-
 2 files changed, 204 insertions(+), 1 deletions(-)
---