[tracker/porting/processor-rework: 5/5] Merge branch 'master' into porting/processor-rework

[Philip Van Hoof <pvanhoof src gnome org>]

commit dfed8228e9877d89b820101b1351c00a35f81f91
Merge: e72e183... 14de07e...
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Jun 10 11:54:26 2009 +0200

    Merge branch 'master' into porting/processor-rework

 data/ontologies/35-ncal.ontology               |    1 -
 src/tracker-extract/tracker-extract-playlist.c |    8 +++---
 src/trackerd/tracker-crawler.c                 |   33 ++++++++++++++++++++---
 src/trackerd/tracker-monitor.c                 |    2 +-
 4 files changed, 33 insertions(+), 11 deletions(-)