Merge branch 'strongswan-v4'
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Tue, 31 Mar 2009 08:57:15 +0000 (10:57 +0200)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Tue, 31 Mar 2009 08:57:15 +0000 (10:57 +0200)
Conflicts:
.gitignore
packages/strongswan/strongswan.spec


Trivial merge