[empathy/gnome-2-28: 18/18] Merge commit 'cosimo/moblin' into gnome-2-28

[Guillaume Desmottes <gdesmott src gnome org>]

commit d6e770d1b8d59919ff7563824843847e9fcddf9a
Merge: 72ee329... b8e7413...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Oct 2 17:36:13 2009 +0100

    Merge commit 'cosimo/moblin' into gnome-2-28
    
    Conflicts:
    	libempathy-gtk/empathy-account-widget.c

 configure.ac                                       |   28 +++
 libempathy-gtk/Makefile.am                         |    2 +
 libempathy-gtk/empathy-account-widget.c            |   83 +++++++-
 libempathy-gtk/empathy-cell-renderer-activatable.c |  205 ++++++++++++++------
 libempathy-gtk/empathy-cell-renderer-activatable.h |    1 +
 src/empathy-accounts-dialog.c                      |   35 ++++
 6 files changed, 283 insertions(+), 71 deletions(-)
---