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

[Paul Wouters]

New commits:
commit 0635a72f227478a4b3f39a70e5574a1fe28f31ea
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Jan 11 00:41:31 2014 -0500

    pluto: only claim 'whacky shutdown' when WHACK_BASIC_MAGIC is different

commit f4fd4384e1c5847942065857cfeb5ab058a7f822
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Jan 11 00:39:28 2014 -0500

    testing: fixup first three test cases for NAT output
    
    This is due to:
    
    commit cb42494defee00f1b6d2cf1c7f2b65c20cbba940
    Author: Paul Wouters <pwouters at redhat.com>
    Date:   Tue Dec 31 12:01:24 2013 -0500
    
        KLIPS: remove NAT_TRAVERSAL check (not to be confused with CONFIG_NAT*)
    
    Which actually turned out to be a bugfix. The eroute display hadn't
    displayd the right nat entries since before we phased out the
    NAT_TRAVERSAL define, because that define only got passed to userland
    and not the KLIPS.