[tracker/tracker-0.6: 2/2] Merge branch 'tracker-0.6' of ssh://mr git gnome org/git/tracker into tracker-0.6

[Martyn James Russell <mr src gnome org>]

commit b561d24727c60fee53eff6cfdea11bd9ceda5b56
Merge: 831f9a8... 8e310f6...
Author: Martyn Russell <martyn imendio com>
Date:   Wed Apr 15 15:20:03 2009 +0100

    Merge branch 'tracker-0.6' of ssh://mr git gnome org/git/tracker into tracker-0.6

 src/libtracker-common/tracker-dbus.c |   23 ++-
 src/libtracker-common/tracker-dbus.h |    2 +
 src/trackerd/tracker-daemon.c        |  398 +++++++++++++++++++++-------------
 src/trackerd/tracker-dbus.c          |  126 ++++++-----
 src/trackerd/tracker-dbus.h          |   21 +-
 5 files changed, 350 insertions(+), 220 deletions(-)