[tracker/tracker-0.10: 5/5] Merge branch 'failsafe-extraction-0.10' into tracker-0.10

[Philip Van Hoof <pvanhoof src gnome org>]

commit 28cf45a37656269470308908cdd79bc4fb42b707
Merge: c2dc99b ea914fb
Author: Philip Van Hoof <philip codeminded be>
Date:   Thu Jan 5 12:55:38 2012 +0100

    Merge branch 'failsafe-extraction-0.10' into tracker-0.10

 src/libtracker-miner/tracker-miner-fs.c |  196 ++++++++++-------------------
 src/miners/fs/tracker-miner-files.c     |  209 ++++++++++++++++++++++++++++---
 2 files changed, 253 insertions(+), 152 deletions(-)
---