Merge branch 'master' of git.strongswan.org:~/strongswan into HEAD
authorTobias Brunner <tobias@strongswan.org>
Thu, 7 May 2009 15:47:48 +0000 (17:47 +0200)
committerTobias Brunner <tobias@strongswan.org>
Thu, 7 May 2009 15:47:48 +0000 (17:47 +0200)

Trivial merge