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

Merge branch 'master' into dracut
---

5aa62a424b5ec48ce2a4232a2a74368c2ba2e942