[tracker: 2/2] Merge branch 'deprecated-g-test-trap-fork'

[Martyn James Russell <mr src gnome org>]

commit c572ecdc6dfe2bcd92537238508fd0fa21f3767b
Merge: 58df122 4d206f7
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Jan 17 18:55:10 2014 +0000

    Merge branch 'deprecated-g-test-trap-fork'

 configure.ac                                      |    2 +-
 tests/libtracker-common/tracker-date-time-test.c  |   23 ++-
 tests/libtracker-common/tracker-dbus-test.c       |  286 +++++----------------
 tests/libtracker-common/tracker-type-utils-test.c |  125 ++++++----
 tests/libtracker-extract/tracker-test-utils.c     |   29 ++-
 tests/libtracker-extract/tracker-test-xmp.c       |   29 ++-
 tests/libtracker-sparql/tracker-test.c            |   63 ++++-
 tests/tracker-steroids/tracker-test.c             |   27 ++-
 8 files changed, 282 insertions(+), 302 deletions(-)
---