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

diff --cc class/50-host-classes
index 3056ffb,f149d5f..b742c5d
--- 1/class/50-host-classes
--- 2/class/50-host-classes
+++ b/class/50-host-classes
@@@ -24,9 -24,12 +24,12 @@@ case $HOSTNAME i
      diskstation*)
        echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF"
          nogrub=1 ;;
 -    freestation04)
 +    freestation7)
          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 ;;