[tracker/nmo: 15/16] Merge branch 'master' into nmo

[Martyn James Russell <mr src gnome org>]

commit 12d12a5c4a245b14bf902e5dfe3069f3e059935f
Merge: 9b93295... 25433bf...
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Dec 3 15:21:09 2009 +0200

    Merge branch 'master' into nmo

 data/ontologies/31-nao.ontology                    |    5 +
 data/ontologies/91-maemo.ontology                  |    5 +
 src/libtracker-miner/tracker-miner-fs.c            |    4 +-
 src/tracker-search-bar/Makefile.am                 |    4 +-
 src/tracker-search-bar/tracker-results-window.c    |  227 ++++++++++++++++----
 src/tracker-search-bar/tracker-utils.c             |  162 ++++++++++++++
 src/tracker-search-bar/tracker-utils.h             |   44 ++++
 utils/data-generators/README                       |   79 +++++++
 utils/data-generators/README.tracker               |   82 -------
 utils/data-generators/generate-all-and-import.sh   |    2 +-
 utils/data-generators/generate-all.sh              |   14 +-
 .../generate-data-for-contact-messages.py          |   84 +++-----
 utils/data-generators/generate-data-for-gossip.py  |    2 +-
 utils/data-generators/generate-data-for-music.py   |  204 ++++++++++--------
 utils/data-generators/generate-name.py             |  200 +++++++++++++++++
 15 files changed, 848 insertions(+), 270 deletions(-)
---