Merge branch 'master' into fsc

diff --cc com32/lib/Makefile
Simple merge

diff --cc com32/modules/Makefile
index 23cd31f,c93d3af..68e5057
--- 1/com32/modules/Makefile
--- 2/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@@ -18,10 -18,10 +18,10 @@@
  topdir = ../..
  include ../MCONFIG
  
- MODULES         = chain.c32 config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \
+ MODULES         = chain.c32 config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 disk.c32 \
            pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 meminfo.c32 \
            sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 kbdmap.c32 cmd.c32 \
 -          vpdtest.c32
 +          vpdtest.c32 host.c32 dir.c32
  
  TESTFILES =