From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 9 Oct 2008 08:14:14 +0000 (+0200)
Subject: Merge branch 'master' into openswan26
X-Git-Tag: v2.3-beta5~4^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49b73619255d1eeec96e82894955874b7ac6a609;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into openswan26
---

49b73619255d1eeec96e82894955874b7ac6a609