Merge branch 'install-raid' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...

Conflicts:
	config/rootfiles/common/i586/grub

diff --cc config/rootfiles/common/i586/grub
index bdb18eb226565ec4f747bddcd0f8d048219e2cff,d3c48af9fc2bd6ea5b94b0e81bff225ed386cbae..9d71942523c501ce34abbaed5ebf817efa3294cb
--- 1/config/rootfiles/common/i586/grub
--- 2/config/rootfiles/common/i586/grub
+++ b/config/rootfiles/common/i586/grub
@@@ -1,6 -1,6 +1,7 @@@
  #boot/grub
  boot/grub/grub.cfg
+ boot/grub/splash.png
 +boot/grub/unifont.pf2
  #etc/bash_completion.d
  #etc/bash_completion.d/grub
  etc/default/grub

diff --cc lfs/grub
Simple merge