From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Mon, 14 Dec 2009 10:31:39 +0000 (+0100)
Subject: Merge branch 'iphone-vpn' into update-522
X-Git-Tag: v2.6~118^2
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=d6b177f6f7e19ff42cea87638d4e0452720d0f95;p=libi2ncommon

Merge branch 'iphone-vpn' into update-522
---

d6b177f6f7e19ff42cea87638d4e0452720d0f95