[tracker/cursor: 2/2] Merge branch 'master' into cursor

[Philip Van Hoof <pvanhoof src gnome org>]

commit 9b44291e95a092954075f8ca94eae98893df2f79
Merge: 7657ee8... ebd8c02...
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Aug 31 09:46:57 2009 +0200

    Merge branch 'master' into cursor

 src/libtracker-db/tracker-db-interface-sqlite.c |   21 ++++++++++++++++++++-
 src/libtracker-db/tracker-db-interface-sqlite.h |   18 ------------------
 2 files changed, 20 insertions(+), 19 deletions(-)
---