[empathy: 7/7] Merge branch 'bug-547658'

[Emilio Pozuelo Monfort <epm src gnome org>]

commit 479275712b6f5984d58728d28d9bad99c94108cf
Merge: a631e25 de93254
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Wed Nov 17 15:29:01 2010 +0100

    Merge branch 'bug-547658'

 libempathy-gtk/empathy-cell-renderer-text.c |   33 +++++-
 libempathy-gtk/empathy-contact-list-store.h |    1 +
 libempathy-gtk/empathy-individual-store.c   |   44 +++++++
 libempathy-gtk/empathy-individual-store.h   |    1 +
 libempathy-gtk/empathy-individual-view.c    |    5 +-
 libempathy-gtk/empathy-individual-widget.c  |  163 ++++++++++++++++++++-------
 libempathy-gtk/empathy-individual-widget.h  |    1 +
 libempathy-gtk/empathy-individual-widget.ui |   29 +++++
 libempathy/empathy-contact.c                |   52 +++++++++-
 libempathy/empathy-contact.h                |    1 +
 libempathy/empathy-tp-contact-factory.c     |    1 +
 11 files changed, 283 insertions(+), 48 deletions(-)
---