Merge branch 'master' of git.strongswan.org:strongswan
authorAndreas Steffen <andi@brisbane.(none)>
Fri, 26 Nov 2010 13:07:18 +0000 (14:07 +0100)
committerAndreas Steffen <andi@brisbane.(none)>
Fri, 26 Nov 2010 13:07:18 +0000 (14:07 +0100)

Trivial merge