Merge branch 'master' into dracut
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Jul 2010 10:09:12 +0000 (12:09 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Jul 2010 10:09:12 +0000 (12:09 +0200)

Trivial merge