bf2b6cb - incorporate backported persistent-keyring (Simo)

Authored and Committed by Nalin Dahyabhai 10 years ago
    - incorporate backported persistent-keyring (Simo)
    
    - incorporate Simo's backport of his persistent-keyring changes (#991148)
    
        
file modified
+9 -1