[empathy: 3/3] Merge branch 'speedup-protocol-chooser'

[Sjoerd Simons <sjoerds src gnome org>]

commit 5d2b0e7740e6929451c630dc072f0ac199f173c3
Merge: ecfcc6c b0bd73c
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Tue May 31 11:20:21 2011 -0700

    Merge branch 'speedup-protocol-chooser'

 libempathy-gtk/empathy-account-chooser.c |   13 +++++++++----
 libempathy-gtk/empathy-chat.c            |    4 ----
 2 files changed, 9 insertions(+), 8 deletions(-)
---