From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 17 Nov 2010 23:14:47 +0000 (+0100)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~16
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e2929cde1203ebeb194264bb7d7b9ca4e484e525

Merge commit 'origin/master' into next

Conflicts:
	make.sh
---

e2929cde1203ebeb194264bb7d7b9ca4e484e525