[empathy: 5/5] Merge branch 'do-say-me-think'

[Will Thompson <wjt src gnome org>]

commit 9488760608fb66ac49951fb39741d524cf009c02
Merge: b81c0c4... c2cbd1d...
Author: Will Thompson <will thompson collabora co uk>
Date:   Fri Aug 28 13:18:44 2009 +0100

    Merge branch 'do-say-me-think'
    
    Reviewed-by: Guillaume Desmottes <guillaume desmottes collabora co uk>

 libempathy-gtk/empathy-chat.c |   32 +++++-------------
 libempathy/empathy-message.c  |   73 ++++++++++++++++++++++++++++++++--------
 libempathy/empathy-message.h  |    1 +
 3 files changed, 68 insertions(+), 38 deletions(-)
---