From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 23 Oct 2010 11:34:53 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~42
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8caf7b64c83ea3641ee66a1e5b35d965ce78f666

Merge commit 'origin/master' into next

Conflicts:
	src/paks/linux-pae/uninstall.sh
---

8caf7b64c83ea3641ee66a1e5b35d965ce78f666