[empathy: 10/10] Merge branch 'av-candidate-624344'

[Guillaume Desmottes <gdesmott src gnome org>]

commit d4397c1120f65ce0f4051156c255857d08b1b4ae
Merge: 493056e 6d744e0
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Aug 5 12:06:53 2010 +0200

    Merge branch 'av-candidate-624344'

 libempathy/empathy-call-handler.c |  178 ++++++++++++++++++++
 libempathy/empathy-call-handler.h |   12 ++
 src/empathy-call-window.c         |  120 ++++++++++++++
 src/empathy-call-window.ui        |  321 ++++++++++++++++++++++++++++++++++++-
 4 files changed, 623 insertions(+), 8 deletions(-)
---