From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 29 Jul 2010 10:09:12 +0000 (+0200)
Subject: Merge branch 'master' into dracut
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~141
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=953d72838a35b10983e260c4d5421e3b22498372

Merge branch 'master' into dracut
---

953d72838a35b10983e260c4d5421e3b22498372