Merge remote branch 'origin/master' into dracut
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 25 Jul 2010 20:48:28 +0000 (22:48 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 25 Jul 2010 20:48:28 +0000 (22:48 +0200)
Conflicts:
lfs/dracut

1  2 
src/install+setup/install/main.c

Simple merge