[empathy: 2/2] Merge commit 'jtellier/call-window-redial-button'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 83912b157904043cbb3d972bd3eb5f8e75f1d1c2
Merge: 93e3219... 9d2cfd5...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jun 9 14:34:48 2009 +0100

    Merge commit 'jtellier/call-window-redial-button'

 libempathy/empathy-call-handler.c |   21 +++-
 libempathy/empathy-call-handler.h |    3 +-
 src/empathy-call-window.c         |  342 ++++++++++++++++++++++++++-----------
 src/empathy-call-window.ui        |   21 +++
 4 files changed, 287 insertions(+), 100 deletions(-)