From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 13 Sep 2010 13:57:05 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~89
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3834d135ecb9383995f305cfe4fa18e9c7511495

Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/update.sh
---

3834d135ecb9383995f305cfe4fa18e9c7511495