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)
commitd8a04a20550a55f5ec071f54d689a6197dd2aa50
treec420cd2476c0f625e419dff69536aecb4e49f689
parent1ea989ebb7f33c9d43ea52761683dacdb21d40de
parentb6de67684f0495b24494b313049d8bfbe609f0a0
Merge remote branch 'origin/master' into dracut

Conflicts:
lfs/dracut
src/install+setup/install/main.c