From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 27 Nov 2010 00:18:29 +0000 (+0100)
Subject: Merge commit 'origin/next'
X-Git-Tag: v2.9-beta1~48^2~5^2~2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=504d0a27d2dca40436d2807cea78bb908b8fa68b

Merge commit 'origin/next'

Conflicts:
	make.sh
---

504d0a27d2dca40436d2807cea78bb908b8fa68b