[tracker: 7/7] Merge branch 'direct-wait'

[Martyn James Russell <mr src gnome org>]

commit 19412e96260cb30f58a044042a25e461b91d2b9b
Merge: b4eeaa8 358f869
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Aug 26 12:10:59 2010 +0100

    Merge branch 'direct-wait'

 data/dbus/tracker-status.xml                  |    3 +
 src/libtracker-bus/tracker-bus.vala           |    2 +-
 src/libtracker-data/tracker-data-manager.c    |    4 ++
 src/libtracker-data/tracker-db-journal.c      |   13 ++++-
 src/libtracker-direct/Makefile.am             |    4 +-
 src/libtracker-direct/tracker-direct.vala     |   16 ++++++
 src/libtracker-sparql/tracker-connection.vala |    2 +
 src/tracker-store/tracker-status.c            |   71 +++++++++++++------------
 src/tracker-store/tracker-status.h            |    3 +
 9 files changed, 78 insertions(+), 40 deletions(-)
---