[empathy: 5/5] Merge branch 'tweaks'

[Sjoerd Simons <sjoerds src gnome org>]

commit 6cbff108ac6211bfdc3638f23f3226f6521449fc
Merge: 82d2397 b4d0635
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Thu Mar 4 16:56:36 2010 +0000

    Merge branch 'tweaks'

 libempathy-gtk/empathy-presence-chooser.c |   12 +++++--
 src/cc-empathy-accounts-page.c            |   24 +++++++++++++++-
 src/empathy-account-assistant.c           |   19 ++++++++----
 src/empathy-accounts-dialog.c             |   45 ++++++++++++++++++++---------
 src/empathy-accounts-dialog.h             |    4 ++
 5 files changed, 78 insertions(+), 26 deletions(-)
---