[tracker/harmattan: 1319/2240] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit a7df67ae37e7f743537a3abbd84231a41ee77d9b
Merge: b0b40fc 3b1a0c9
Author: Ivan Frade <ivan frade nokia com>
Date:   Fri Oct 16 11:13:20 2009 +0300

    Merge branch 'master' into harmattan

 configure.ac                                       |    5 -
 src/tracker-preferences/Makefile.am                |   13 +-
 src/tracker-preferences/tracker-preferences.ui     |   75 +++++-
 src/tracker-preferences/tracker-preferences.vala   |   32 ++
 .../tracker-status-icon-config.vapi                |   29 ++
 src/tracker-status-icon/Makefile.am                |    2 +
 src/tracker-status-icon/tracker-icon-config.c      |  315 ++++++++++++++++++++
 src/tracker-status-icon/tracker-icon-config.h      |   67 ++++
 src/tracker-status-icon/tracker-main.c             |    2 +-
 src/tracker-status-icon/tracker-status-icon.c      |  167 ++++++++++-
 tests/functional-tests/tests.xml                   |    6 +-
 11 files changed, 685 insertions(+), 28 deletions(-)
---