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

[Tuomo Soini]

New commits:
commit 25db3fa3ea6d2ccd5e8f1baa4095c7f82fa87045
Merge: 7e8af6e c81069f
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Mar 19 10:29:49 2013 +0200

    Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan
    
    Conflicts:
    	Makefile.inc

commit 7e8af6e16897daa681c6fe6e96cfbe750857e59a
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Mar 19 10:26:09 2013 +0200

    ipsec: cleanup coding style

commit 6ffca8740086509964d2c2ce6024438df33d663a
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Mar 19 10:14:22 2013 +0200

    update changes for bug #76 fix

commit fb89162dccb46e1f2158957fe821f99cc506deba
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Mar 19 10:12:06 2013 +0200

    initnss: fix bug #76: ipsec initnss fails with a @FINALCONFDDIR@ replace and
    no default configdir