Merge branch 'master' into dracut
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 22 Jul 2010 10:49:08 +0000 (12:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 22 Jul 2010 10:49:08 +0000 (12:49 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge