[kupfer: 38/41] Merge branch 'keyringinfo'

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 471ddabb4cb82259772c045e5325eb258e263fce
Merge: 10a00e4 1778662
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Apr 26 18:54:35 2011 +0200

    Merge branch 'keyringinfo'
    
    * keyringinfo:
      plugin_support: Initialize keyring early in check_keyring_support.
      preferences: Present keyring backend information

 data/credentials_dialog.ui      |   32 +++++++++++++++++++++++++++++++-
 kupfer/plugin_support.py        |   31 +++++++++++++++++++++++--------
 kupfer/ui/credentials_dialog.py |   11 ++++++++---
 kupfer/ui/preferences.py        |    7 ++++++-
 4 files changed, 68 insertions(+), 13 deletions(-)
---