[Swan-commit] Changes to ref refs/heads/master

[Paul Wouters]

New commits:
commit 3f25a3c8fd4be25f678bcfd75866b5b928939106
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Sep 22 11:27:32 2014 -0400

    updated changes

commit a69fa93c2378c9bfa116e722c96b192e4413b473
Author: Oskari Saarenmaa <os at ohmu.fi>
Date:   Mon Sep 22 11:23:08 2014 -0400

    pluto: ignore and warn about empty passphrase for NSS private keys
    
    README.nss used to recommend adding an empty passphrase for NSS keys in
    ipsec.secrets but commit 96d89e16 made any extra tokens errors which breaks
    old ipsec.secrets files when used with new libreswan versions.
    
    Ignore an empty passphrase token for now and log a warning about it saying
    it'll be an error in a future release.
    
    this is rhbz#1144941 (fedora) and rhbz#1145231 (rhel7)