[tracker: 5/5] Merge branch 'nautilus-issues'

[Martyn James Russell <mr src gnome org>]

commit a34c0df16d688eab94211d0e24c39d3ddd74ab42
Merge: 00f39dd 98a8948
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Sep 12 20:14:17 2011 +0100

    Merge branch 'nautilus-issues'

 configure.ac                                  |    6 +-
 src/plugins/nautilus/tracker-tags-extension.c |   67 ++----
 src/plugins/nautilus/tracker-tags-utils.c     |   58 +----
 src/plugins/nautilus/tracker-tags-utils.h     |    1 -
 src/plugins/nautilus/tracker-tags-view.c      |  331 +++++++++++++++----------
 src/plugins/nautilus/tracker-tags-view.h      |    6 +-
 6 files changed, 222 insertions(+), 247 deletions(-)
---