From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 1 Aug 2010 17:09:25 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~135
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8642d602745a91ec741d8386743aa47ee543ba27

Merge branch 'master' into next
---

8642d602745a91ec741d8386743aa47ee543ba27