From: Gerd von Egidy <gerd.von.egidy@intra2net.com>
Date: Fri, 18 Jun 2010 09:00:49 +0000 (+0200)
Subject: Merge branch 'kernel-2.6.34' into vpn-nat: vpn-nat needs 2.6.34
X-Git-Tag: v2.6~100^2~4
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=9470a758c0b76ddb94732a6b8f80cc7812ad4e3b;p=libi2ncommon

Merge branch 'kernel-2.6.34' into vpn-nat: vpn-nat needs 2.6.34

Conflicts:
	packages/kernel/kernel-2.6.34-i686-PAE.config
---

9470a758c0b76ddb94732a6b8f80cc7812ad4e3b