[empathy: 2/2] Merge remote branch 'glassrose/Display-typing-icon-in-muc-contacts-list-609419'

[Guillaume Desmottes <gdesmott src gnome org>]

commit dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f
Merge: 8eb3671 1acf899
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jan 18 16:12:40 2011 +0100

    Merge remote branch 'glassrose/Display-typing-icon-in-muc-contacts-list-609419'

 libempathy-gtk/empathy-contact-list-store.c |   60 ++++++++++++++++++++++++++-
 libempathy/empathy-tp-chat.c                |    9 ++++
 libempathy/empathy-tp-chat.h                |    3 +
 src/empathy-chat-manager.c                  |    4 +-
 4 files changed, 74 insertions(+), 2 deletions(-)
---