[empathy: 8/8] Merge branch 'accounts-wizard'

[Sjoerd Simons <sjoerds src gnome org>]

commit 41ca7cb4fea39f928976b7b69466a61c78a5f7ed
Merge: 74b2a16 3c8e671
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Tue Mar 2 11:39:14 2010 +0000

    Merge branch 'accounts-wizard'

 src/cc-empathy-accounts-page.c |    4 +-
 src/empathy-accounts-common.c  |   83 +++----------------------------
 src/empathy-accounts-common.h  |    6 +--
 src/empathy-accounts-dialog.c  |   11 +++-
 src/empathy-accounts-dialog.h  |    2 +-
 src/empathy-accounts.c         |  105 ++++++++++++++++++----------------------
 src/empathy.c                  |   22 +++++++-
 7 files changed, 87 insertions(+), 146 deletions(-)
---