From: Gerd von Egidy <gerd.von.egidy@intra2net.com>
Date: Thu, 7 Oct 2010 15:17:10 +0000 (+0200)
Subject: Merge branch 'master' into vpn-nat
X-Git-Tag: v2.6~100^2~1
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=9c9f4290fb0d6220b2e2c60b858028be07f1e118;p=libi2ncommon

Merge branch 'master' into vpn-nat

Conflicts:
	generate/generate/ipsec.ag
	generate/generate/make_usedvar.pl
	generate/generate/named.ag
	miscscripts/miscscripts.spec
	packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion-kerneldevpkgs-current
	packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion.spec
	packages/kernel/kernel-2.6.33.3-i686-smp.config
	packages/kernel/kernel-2.6.33.3-i686.config
	packages/kernel/kernel-2.6.34-i686-PAE.config
	packages/kernel/kernel-2.6.34-i686.config
	packages/kernel/kernel-2.6.34.4-i686-PAE.config
	packages/kernel/kernel-2.6.34.4-i686.config
	packages/kernel/kernel.spec
	packages/strongswan/strongswan.spec
	ui/ui/form_keys_foreign.cpp
	ui/ui/form_vpn_connections.cpp
	update_cnf/src/Makefile.am
	update_cnf/src/update_5.3.2.cpp
---

9c9f4290fb0d6220b2e2c60b858028be07f1e118