Merge remote-tracking branch 'origin/next' into install-raid

Conflicts:
	lfs/bash

diff --cc config/rootfiles/common/bash
index 84f587f3cdb458ab43f156b7d985f57a1fe2ec4f,6afa0e45ec4bf0029d8835743d47364adac262c0..a2b6a87e3d8fe670b81f062dc9340c998381940a
--- 1/config/rootfiles/common/bash
--- 2/config/rootfiles/common/bash
+++ b/config/rootfiles/common/bash
@@@ -13,47 -13,44 +13,86 @@@ bin/bas
  #usr/share/doc/bash/bash.html
  #usr/share/doc/bash/bashref.html
  #usr/share/info/bash.info
 +#usr/share/locale/af/LC_MESSAGES/bash.mo
 +#usr/share/locale/bg/LC_MESSAGES/bash.mo
 +#usr/share/locale/ca/LC_MESSAGES/bash.mo
 +#usr/share/locale/cs/LC_MESSAGES/bash.mo
 +#usr/share/locale/da/LC_MESSAGES/bash.mo
 +#usr/share/locale/de/LC_MESSAGES/bash.mo
 +#usr/share/locale/el/LC_MESSAGES/bash.mo
 +#usr/share/locale/en@boldquot
 +#usr/share/locale/en@boldquot/LC_MESSAGES
 +#usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
 +#usr/share/locale/en@quot
 +#usr/share/locale/en@quot/LC_MESSAGES
 +#usr/share/locale/en@quot/LC_MESSAGES/bash.mo
 +#usr/share/locale/eo/LC_MESSAGES/bash.mo
 +#usr/share/locale/es/LC_MESSAGES/bash.mo
 +#usr/share/locale/et/LC_MESSAGES/bash.mo
 +#usr/share/locale/fi/LC_MESSAGES/bash.mo
 +#usr/share/locale/fr/LC_MESSAGES/bash.mo
 +#usr/share/locale/ga/LC_MESSAGES/bash.mo
 +#usr/share/locale/gl/LC_MESSAGES/bash.mo
 +#usr/share/locale/hr/LC_MESSAGES/bash.mo
 +#usr/share/locale/hu/LC_MESSAGES/bash.mo
 +#usr/share/locale/id/LC_MESSAGES/bash.mo
 +#usr/share/locale/it/LC_MESSAGES/bash.mo
 +#usr/share/locale/ja/LC_MESSAGES/bash.mo
 +#usr/share/locale/lt/LC_MESSAGES/bash.mo
 +#usr/share/locale/nl/LC_MESSAGES/bash.mo
 +#usr/share/locale/pl/LC_MESSAGES/bash.mo
 +#usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
 +#usr/share/locale/ro/LC_MESSAGES/bash.mo
 +#usr/share/locale/ru/LC_MESSAGES/bash.mo
 +#usr/share/locale/sk/LC_MESSAGES/bash.mo
 +#usr/share/locale/sl/LC_MESSAGES/bash.mo
 +#usr/share/locale/sr
 +#usr/share/locale/sr/LC_MESSAGES
 +#usr/share/locale/sr/LC_MESSAGES/bash.mo
 +#usr/share/locale/sv/LC_MESSAGES/bash.mo
 +#usr/share/locale/tr/LC_MESSAGES/bash.mo
 +#usr/share/locale/uk/LC_MESSAGES/bash.mo
 +#usr/share/locale/vi/LC_MESSAGES/bash.mo
 +#usr/share/locale/zh_CN/LC_MESSAGES/bash.mo
 +#usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
  #usr/share/man/man1/bash.1
  #usr/share/man/man1/bashbug.1
+ #usr/share/locale/af
+ #usr/share/locale/af/LC_MESSAGES
+ #usr/share/locale/af/LC_MESSAGES/bash.mo
+ #usr/share/locale/bg/LC_MESSAGES/bash.mo
+ #usr/share/locale/ca/LC_MESSAGES/bash.mo
+ #usr/share/locale/cs/LC_MESSAGES/bash.mo
+ #usr/share/locale/da/LC_MESSAGES/bash.mo
+ #usr/share/locale/de/LC_MESSAGES/bash.mo
+ #usr/share/locale/el/LC_MESSAGES/bash.mo
+ #usr/share/locale/en@boldquot
+ #usr/share/locale/en@boldquot/LC_MESSAGES
+ #usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
+ #usr/share/locale/en@quot/LC_MESSAGES/bash.mo
+ #usr/share/locale/eo/LC_MESSAGES/bash.mo
+ #usr/share/locale/es/LC_MESSAGES/bash.mo
+ #usr/share/locale/et/LC_MESSAGES/bash.mo
+ #usr/share/locale/fi/LC_MESSAGES/bash.mo
+ #usr/share/locale/fr/LC_MESSAGES/bash.mo
+ #usr/share/locale/ga/LC_MESSAGES/bash.mo
+ #usr/share/locale/gl/LC_MESSAGES/bash.mo
+ #usr/share/locale/hr/LC_MESSAGES/bash.mo
+ #usr/share/locale/hu/LC_MESSAGES/bash.mo
+ #usr/share/locale/id/LC_MESSAGES/bash.mo
+ #usr/share/locale/it/LC_MESSAGES/bash.mo
+ #usr/share/locale/ja/LC_MESSAGES/bash.mo
+ #usr/share/locale/lt/LC_MESSAGES/bash.mo
+ #usr/share/locale/nl/LC_MESSAGES/bash.mo
+ #usr/share/locale/pl/LC_MESSAGES/bash.mo
+ #usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
+ #usr/share/locale/ro/LC_MESSAGES/bash.mo
+ #usr/share/locale/ru/LC_MESSAGES/bash.mo
+ #usr/share/locale/sk/LC_MESSAGES/bash.mo
+ #usr/share/locale/sl/LC_MESSAGES/bash.mo
+ #usr/share/locale/sr
+ #usr/share/locale/sr/LC_MESSAGES
+ #usr/share/locale/sr/LC_MESSAGES/bash.mo
+ #usr/share/locale/sv/LC_MESSAGES/bash.mo
+ #usr/share/locale/tr/LC_MESSAGES/bash.mo
+ #usr/share/locale/uk/LC_MESSAGES/bash.mo

diff --cc lfs/bash
index ae5a2837ace18fbd0ba1c0414984ad67ff3cfcbb,e6c8d5eb23ce59d033b2e57a83fcc23e741bccbd..79dce52880edd3f5dd5dee9544f3fe3cabbd17c2
--- 1/lfs/bash
--- 2/lfs/bash
+++ b/lfs/bash
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
--# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
++# Copyright (C) 2007-2014   IPFire Team   <info@ipfire.org>                   #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #

diff --cc make.sh
Simple merge