[empathy: 3/3] Merge remote branch 'vminko/fix-632024-v2'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 0446279dbf79a85718ca7a71bb6588d389ed15f5
Merge: d91cd1d b3a5b44
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Oct 18 15:22:46 2010 +0200

    Merge remote branch 'vminko/fix-632024-v2'

 libempathy-gtk/empathy-individual-view.c |   19 +++++++++++++++----
 libempathy-gtk/empathy-individual-view.h |    2 ++
 src/empathy-main-window.c                |   10 ++++++++++
 src/empathy-main-window.ui               |    7 +++++++
 4 files changed, 34 insertions(+), 4 deletions(-)
---