From: Gerd von Egidy <gerd.von.egidy@intra2net.com>
Date: Tue, 31 Mar 2009 08:57:15 +0000 (+0200)
Subject: Merge branch 'strongswan-v4'
X-Git-Tag: v2.6~129
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=a4a4891720d19980e48e491be81b99ee55ad0ff7;p=libi2ncommon

Merge branch 'strongswan-v4'

Conflicts:
	.gitignore
	packages/strongswan/strongswan.spec
---

a4a4891720d19980e48e491be81b99ee55ad0ff7