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

[Paul Wouters]

New commits:
commit 6ce0109296db5d59aed686ed2a4e82612a644181
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu May 1 16:34:03 2014 -0400

    Revert "NAT-T: new style uses setsockopt and old (KLIPS-only) uses ioctl"
    
    This reverts commit 076142aa122d3d647cbea59f0682b327cc017c1f.
    
    Conflicts:
    	programs/pluto/nat_traversal.c