Merge with 3.2x branch

Conflicts:

	com32/modules/Makefile

diff --cc com32/modules/Makefile
index c45b057,f7f5340..3c272f2
--- 1/com32/modules/Makefile
--- 2/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@@ -1,6 -1,6 +1,6 @@@
  ## -----------------------------------------------------------------------
  ##
--##   Copyright 2001-2004 H. Peter Anvin - All Rights Reserved
++##   Copyright 2001-2006 H. Peter Anvin - All Rights Reserved
  ##
  ##   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
@@@ -44,8 -44,8 +44,8 @@@ AUXDIR   = $(LIBDIR)/syslinu
  INCDIR   = /usr/include
  COM32DIR = $(AUXDIR)/com32
  
- MODULES         = chain.c32 menu.c32 vesamenu.c32 ethersel.c32 mboot.c32 dmitest.c32 cpuidtest.c32
 -MODULES         = chain.c32 menu.c32 ethersel.c32 mboot.c32 dmitest.c32 cpuidtest.c32 pcitest.c32
 -TESTFILES = menu.lnx
++MODULES         = chain.c32 menu.c32 vesamenu.c32 ethersel.c32 mboot.c32 dmitest.c32 cpuidtest.c32 pcitest.c32
 +TESTFILES = 
  
  all: $(MODULES) $(TESTFILES)