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

[D. Hugh Redelmeier]

New commits:
commit 0aaca3b0abc8eeec87f973a663201e4da16c727b
Merge: 1eac0bb ad34d4f
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Apr 23 18:41:33 2014 -0400

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
    
    Conflicts:
    	linux/include/libreswan.h
    	programs/pluto/addresspool.c

commit 1eac0bbe7efc09ae80c6ac58d2030778b840d977
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Apr 23 18:36:49 2014 -0400

    - addrcmp now treats Address Family as most significant component
    - ip_address_family is for kernel code; use addrtypeof in userland
    - ip_address_eq is for kernel code; use sameaddr in userland
    - ip_address_isany is for kernel code; use isanyaddr in userland