[empathy: 10/10] Merge branch 'muc-password'

[Jonny Lamb <jonnylamb src gnome org>]

commit 38a7c551fb07d72dd7b6744a8d1a345466b011d2
Merge: 7f5c02a b03dfef
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Tue Feb 1 08:50:22 2011 +0000

    Merge branch 'muc-password'

 libempathy-gtk/empathy-chat.c            |  177 ++++++++++++++++++++++++++++--
 libempathy/empathy-account-settings.c    |   16 ++--
 libempathy/empathy-auth-factory.c        |    4 +-
 libempathy/empathy-keyring.c             |  162 +++++++++++++++++++--------
 libempathy/empathy-keyring.h             |   28 ++++-
 libempathy/empathy-server-sasl-handler.c |    8 +-
 libempathy/empathy-utils.h               |   45 ++++++++
 7 files changed, 365 insertions(+), 75 deletions(-)
---