[tracker: 4/4] Merge branch 'media-art-enhancements-2'

[Martyn James Russell <mr src gnome org>]

commit c5760d5987e18bfd5eb0100b2ba364a722ebab75
Merge: a4cb0a7 789f073
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Mar 14 17:25:33 2013 +0000

    Merge branch 'media-art-enhancements-2'

 src/libtracker-miner/tracker-media-art.c |   10 +++---
 src/libtracker-miner/tracker-media-art.h |    6 ++--
 src/libtracker-miner/tracker-miner-fs.c  |    4 +-
 src/tracker-extract/tracker-media-art.c  |   44 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)
---