[empathy: 2/2] Merge branch 'accounts-dialog-attractive'

[Danielle Madeley <daniellem src gnome org>]

commit 3a1ca5a962eef416f19f7082246a7b2249fe7121
Merge: eacf74c c22df19
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Wed Jun 15 11:00:33 2011 +0100

    Merge branch 'accounts-dialog-attractive'

 src/empathy-accounts-dialog.c  |   11 ++++
 src/empathy-accounts-dialog.ui |   99 +++++++++++++++++++--------------------
 2 files changed, 59 insertions(+), 51 deletions(-)
---