[empathy: 2/2] Merge commit 'jtellier/reconnect-account'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 607bea527c91d369b6f0d16b1bb63699310d71ed
Merge: c8eb875... 8dba395...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Aug 27 14:41:32 2009 +0100

    Merge commit 'jtellier/reconnect-account'

 libempathy-gtk/empathy-account-widget.c |   63 +++++++++++++------------------
 libempathy/empathy-account.c            |   43 +++++++++++++++++++++
 libempathy/empathy-account.h            |    7 +++
 3 files changed, 76 insertions(+), 37 deletions(-)
---