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

[Martyn James Russell <mr src gnome org>]

commit e02e37399aae5f27697d17adb91acd95177f40af
Merge: 2dd82fc d9198de
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 16 16:35:48 2009 +0100

    Merge branch 'master' into harmattan

 NEWS                                          |   65 +++
 configure.ac                                  |    2 +-
 src/libtracker-data/tracker-sparql-query.vala |   55 ++-
 src/tracker-extract/tracker-albumart.c        |  180 +++----
 src/tracker-preferences/Makefile.am           |    7 +-
 src/tracker-status-icon/Makefile.am           |    4 +
 src/tracker-status-icon/eggaccelerators.c     |  657 +++++++++++++++++++++++++
 src/tracker-status-icon/eggaccelerators.h     |   87 ++++
 src/tracker-status-icon/tomboykeybinder.c     |  320 ++++++++++++
 src/tracker-status-icon/tomboykeybinder.h     |   27 +
 src/tracker-status-icon/tracker-main.c        |    4 +-
 src/tracker-status-icon/tracker-status-icon.c |   27 +
 12 files changed, 1316 insertions(+), 119 deletions(-)
---