[tracker: 3/3] Merge branch 'sam/functional-test-40x-fixes'

[Sam Thursfield <sthursfield src gnome org>]

commit 75b81e54d1e9831a92e846dc043975361c63ac4c
Merge: 70f1bcc f515694
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Dec 26 22:47:00 2014 +0000

    Merge branch 'sam/functional-test-40x-fixes'

 src/tracker-extract/tracker-extract-gstreamer.c    |   34 ++++++++++++++++++-
 .../functional-tests/common/utils/writebacktest.py |    2 +-
 .../test-extraction-data/images/roi.expected       |    1 -
 .../test-extraction-data/images/roi2.expected      |    1 -
 4 files changed, 33 insertions(+), 5 deletions(-)
---