[empathy: 5/5] Merge branch 'update-display-name-603463'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 4728aaffa21812eb2e6bd8b9eeac0cceccb85437
Merge: 46adf4f 1dab115
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Mar 3 11:54:57 2010 +0100

    Merge branch 'update-display-name-603463'

 libempathy-gtk/empathy-account-widget.c |   22 ++++++++++++++++++----
 libempathy/empathy-account-settings.c   |    7 +++++++
 2 files changed, 25 insertions(+), 4 deletions(-)
---