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

[Paul Wouters]

New commits:
commit 7fb81cf80b14b502181af27eb68547c83bed960d
Merge: e91c6a6 5eb2b6f
Author: Paul Wouters <paul at libreswan.org>
Date:   Wed Jan 9 16:16:50 2013 -0500

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

commit e91c6a6f028ca4c80c08f4282d0693699c76bcb2
Author: Paul Wouters <paul at libreswan.org>
Date:   Wed Jan 9 16:14:05 2013 -0500

    * testing: added iphone 4s racoon config within testing framework
    
    This test is incomplete. But contains the racoon config extracted
    from an iphone 4s. It is likely modified for using the apple keychain
    to obtain certificates, so we will need to use the stock racoon
    method for specifying the certificates.