From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 25 Jul 2010 20:48:28 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into dracut
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~146
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d8a04a20550a55f5ec071f54d689a6197dd2aa50;hp=--cc

Merge remote branch 'origin/master' into dracut

Conflicts:
	lfs/dracut
---

d8a04a20550a55f5ec071f54d689a6197dd2aa50