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

[Paul Wouters]

New commits:
commit 666c487820f6573ec6e73b5753c5f0dd13c70cb4
Merge: 970ad80 548c206
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 20 18:32:17 2013 -0400

    Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan

commit 970ad80122874c419f75f871ed4462a38dead31b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 20 18:30:25 2013 -0400

    updated changes

commit e6b2e65ccbbba175b294b709bd284ec0112ca9f9
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 20 18:20:08 2013 -0400

    pluto: nhelpers= does not default to -1 (lsbz#126)
    
    If pluto was started using --config /etc/ipsec.conf, we would read the
    nhelpers= line from "config setup". If that line was not specified, we
    defaulted to 0. When not using --config, we defaulted to -1.
    
    ipsecconf_default_values() now sets nhelpers to -1, so that when --config
    is used without an nhelpers= line, we do the right thing.
    
    (related: currently we cannot specify "-1")