Index: branches/RC/core/admin_templates/js/inp_fckconfig.js
===================================================================
diff -u -N -r11852 -r11914
--- branches/RC/core/admin_templates/js/inp_fckconfig.js	(.../inp_fckconfig.js)	(revision 11852)
+++ branches/RC/core/admin_templates/js/inp_fckconfig.js	(.../inp_fckconfig.js)	(revision 11914)
@@ -34,6 +34,9 @@
 	['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','-', 'MySource']
 ] ;
 
+FCKConfig.EnterMode = 'br' ;		// p | div | br
+FCKConfig.ShiftEnterMode = 'p' ;	// p | div | br
+
 FCKConfig.Keystrokes = [
 	[ CTRL + 65 /*A*/, true ],
 	[ CTRL + 67 /*C*/, true ],