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

[Paul Wouters]

New commits:
commit 6d41e8a341bb6f4191e8f3f61ec52c0a7265956e
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Apr 29 18:03:34 2013 -0400

    * updated changes

commit babfbbbb219ac8a58dbe87279a13a85fc6f5cd2c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Apr 29 18:02:26 2013 -0400

    Revert "* IKEv2: Initiating IKEv2 with nhelpers=0 failed"
    
    This reverts commit 05edc7769f4c962012fb00e1102dedd01fb5f23a.
    
    Conflicts:
    	programs/pluto/ikev2.c