Merge branch 'master' into fsc

Resolved Conflicts:
	core/configinit.inc
	version

Resolved Undetected Conflicts:
	 core/ui.inc

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --cc core/configinit.inc
Simple merge

diff --cc core/ui.inc
index 9a653b1,348527a..ec9190a
--- 1/core/ui.inc
--- 2/core/ui.inc
+++ b/core/ui.inc
@@@ -301,6 -307,12 +310,12 @@@ auto_boot
                rep movsd
                jmp short load_kernel
  
 -              section .data
++              section .data16
+ no_default_msg        db 'No DEFAULT or UI configuration directive found!'
+               db CR, LF, 0
+ 
 -              section .text
++              section .text16
+ 
  ;
  ; Jump here when the command line is completed
  ;

diff --cc version
index 6b7452c,5487373..5be9d7e
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- 4.00 2009
 -3.85 2010
++4.00 2010