[empathy: 2/2] Merge commit 'jtellier/video-call-stop-showing-last-frame'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 551fe27bfb5078ae95d2a4d418df7abe66db0a93
Merge: 40d3362... 2360a56...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jun 16 15:26:09 2009 +0100

    Merge commit 'jtellier/video-call-stop-showing-last-frame'

 libempathy/empathy-call-handler.c |    4 +++-
 libempathy/empathy-tp-call.c      |    6 ++++--
 src/empathy-call-window.c         |   31 ++++++++++++++++++++++++++++---
 3 files changed, 35 insertions(+), 6 deletions(-)
---