Merge with 3.3x branch

Conflicts:

	NEWS
	version

diff --cc NEWS
index c208c9c,e04389a..94d78be
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,12 -2,9 +2,15 @@@ Starting with 1.47, changes marked wit
  apply to that specific program only; other changes apply to all of
  them.
  
 +Changes in 3.40:
 +      * New keywords allow the type of file to be specified in the
 +        configuration file.
 +      * It is now supported to load a different configuration file
 +        with the CONFIG keyword.
 +
+ Changes in 3.32:
+       * MEMDISK: New "safeint" mode.
+ 
  Changes in 3.31:
        * The simple menu system (menu.c32 and vesamenu.c32) now
          support loading more than one configuration file at a time,