From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 15 Jun 2011 16:51:31 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~94
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=00269c4c8c235aaaa86ebea41e1b42d27b880c97

Merge branch 'master' into next

Conflicts:
	make.sh
---

00269c4c8c235aaaa86ebea41e1b42d27b880c97