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

[Paul Wouters]

New commits:
commit 4f1fa2cf06beb9d418e1a17c8417178990c30ebb
Merge: 9e11cd7 f9b1bef
Author: Paul Wouters <paul at libreswan.org>
Date:   Sat Jan 12 14:33:19 2013 -0500

    Merge branch 'master' of vault.foobar.fi:/srv/src/libreswan

commit 9e11cd71ab6e16bf2875d1b18fc122c69b93b4da
Author: Paul Wouters <paul at libreswan.org>
Date:   Sat Jan 12 14:31:12 2013 -0500

    * pluto: move call to find_ifaces()
    
    This implements Philippe's resolution for correct connection loading
    at startup with the changed timing as a result of the new addconn
    thread that pluto starts to load the connections that used to be
    loaded using the _plutoload script started separately.