[tracker: 12/12] Merge branch 'merge-control-status'

[Martyn James Russell <mr src gnome org>]

commit b1b02275e6f7928ded3365002da0bedcf7b191ab
Merge: b11bd4b 116ed0f
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Feb 3 12:47:35 2011 +0000

    Merge branch 'merge-control-status'

 docs/manpages/Makefile.am                          |    1 -
 docs/manpages/tracker-control.1                    |  108 ++++-
 docs/manpages/tracker-stats.1                      |    2 +-
 docs/manpages/tracker-status.1                     |   99 ----
 docs/manpages/tracker-store.1                      |    2 +-
 src/tracker-control/Makefile.am                    |   19 +-
 src/tracker-control/tracker-control-general.c      |  541 ++++++++++++++++++++
 src/tracker-control/tracker-control-miners.c       |  432 ++++++++++++++++
 .../tracker-control-status.c}                      |  497 +++++-------------
 src/tracker-control/tracker-control.c              |  539 ++------------------
 src/tracker-control/tracker-control.h              |   38 ++
 src/tracker-utils/Makefile.am                      |    4 -
 12 files changed, 1294 insertions(+), 988 deletions(-)
---