From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 29 Jan 2010 05:52:00 +0000 (+0100)
Subject: Merge branch 'core36'
X-Git-Tag: v2.9-beta1~482
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=07f50f1102a5b32b399280901019f014fd52ada7

Merge branch 'core36'
---

07f50f1102a5b32b399280901019f014fd52ada7