Merge branch 'master' of vcs.fsf.org:fai-configs

diff --combined class/50-host-classes
index b42f8b643a4b96ee6546e0663e0df280b8d17bb0,d845e3a277f72f615ef2b86c3f921c4e52f0d9fc..f149d5f819b8242e8f3f757c056f79ff57a7fdc3
--- 1/class/50-host-classes
--- 2/class/50-host-classes
+++ b/class/50-host-classes
@@@ -27,9 -27,6 +27,9 @@@ case $HOSTNAME i
      freestation04)
          echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN MV"
          nogrub=1 ;;
 +    freestation06)
 +        echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN JAPANESE"
 +        nogrub=1 ;;
      freestation*)
          echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
          nogrub=1 ;;
@@@ -49,10 -46,10 +49,10 @@@
          nogrub=1
          ;;
      streamstation*)
-         echo "FAIBASE DHCPC SYSADMIN STREAM"
+         echo "FAIBASE DHCPC SYSADMIN STREAM LIBREPLANET"
          ;;
      freetop*)
-         echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION"
+         echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"
          ;;
  
      *)