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

[Paul Wouters]

New commits:
commit 57e90f9e547fa51c6b94aa4e8b11c41ddaebfb3b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Sep 1 11:38:05 2014 -0400

    constants.c: Use IKEv1 and IKEv2 registry entries for ESP_CAMELLIA
    
    The Linux kernel PF_KEY API returns the IKEv1 number to us
    (and sadly even returns it when you delete the camellia .ko files)