[empathy: 4/4] Merge remote-tracking branch 'pochu/misc-fixes'

[Danielle Madeley <daniellem src gnome org>]

commit 7b6b8da406493311445f6c2470a005a542972693
Merge: 1180b05 2f9a520
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Fri Oct 14 15:27:12 2011 +1100

    Merge remote-tracking branch 'pochu/misc-fixes'

 libempathy-gtk/empathy-call-utils.c |    2 ++
 libempathy-gtk/empathy-ui-utils.c   |    3 +++
 src/empathy-call-window.c           |    7 ++++---
 3 files changed, 9 insertions(+), 3 deletions(-)
---