[tracker: 2/2] Merge branch 'meegotouch'

[Martyn James Russell <mr src gnome org>]

commit 4fead4a8fd6d72629f91de7177031907650ab1ce
Merge: 1afe402 e030aef
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Apr 26 15:15:34 2011 +0100

    Merge branch 'meegotouch'

 configure.ac                                       |    8 +-
 src/libtracker-common/Makefile.am                  |   16 +----
 src/libtracker-common/tracker-common.h             |    1 -
 src/libtracker-extract/Makefile.am                 |   14 ++++
 .../tracker-encoding-enca.c                        |    0
 .../tracker-encoding-enca.h                        |    6 +-
 .../tracker-encoding-meegotouch.cpp                |    2 +-
 .../tracker-encoding-meegotouch.h                  |    6 +-
 .../tracker-encoding.c                             |    0
 .../tracker-encoding.h                             |   14 ++--
 src/libtracker-extract/tracker-extract.h           |    1 +
 tests/libtracker-common/Makefile.am                |    2 +-
 tests/libtracker-common/tracker-utils-test.c       |   33 ----------
 tests/libtracker-extract/.gitignore                |    1 +
 tests/libtracker-extract/Makefile.am               |    6 ++
 .../encoding-detect.bin                            |    0
 tests/libtracker-extract/tracker-encoding-test.c   |   65 ++++++++++++++++++++
 17 files changed, 108 insertions(+), 67 deletions(-)
---