From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 2 Oct 2011 19:17:10 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-core54~13^2~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84aed1ea54ea5e482d3e7dcd7075188062ae85b1;p=ipfire-2.x.git

Merge commit 'origin/master' into next

Conflicts:
	make.sh
---

84aed1ea54ea5e482d3e7dcd7075188062ae85b1