[empathy: 7/7] Merge branch 'balance-errors'

[Danielle Madeley <daniellem src gnome org>]

commit 60a28f1712b841606b278cad8f3637b346063a79
Merge: 8977f50 bf6ec91
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Sat Oct 22 08:45:04 2011 +1100

    Merge branch 'balance-errors'

 src/empathy-call-handler.c |   11 ++++-
 src/empathy-call-window.c  |  101 +++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 103 insertions(+), 9 deletions(-)
---