Index: makesdna/DNA_userdef_types.h
===================================================================
--- makesdna/DNA_userdef_types.h	(revision 10746)
+++ makesdna/DNA_userdef_types.h	(working copy)
@@ -204,6 +204,7 @@
 #define USER_NONUMPAD			8192
 #define USER_LMOUSESELECT		16384
 #define USER_FILECOMPRESS		32768
+#define USER_ADD_OB_AUTOEDIT	65536
 
 /* viewzom */
 #define USER_ZOOM_CONT			0
Index: src/editmesh_add.c
===================================================================
--- src/editmesh_add.c	(revision 10746)
+++ src/editmesh_add.c	(working copy)
@@ -48,6 +48,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_userdef_types.h"
 #include "DNA_view3d_types.h"
 
 #include "BLI_blenlib.h"
@@ -1336,7 +1337,12 @@
 	DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);	
 
 	/* if a new object was created, it stores it in Mesh, for reload original data and undo */
-	if(newob) load_editMesh();	
+	if ( !(newob) || !(U.flag & USER_ADD_OB_AUTOEDIT)) {
+		if(newob) load_editMesh();
+	} else {
+		exit_editmode(2);
+	}
+
 	BIF_undo_push(undostr);
 }
 
Index: src/space.c
===================================================================
--- src/space.c	(revision 10746)
+++ src/space.c	(working copy)
@@ -3457,6 +3457,11 @@
 			(xpos+edgsp+(mpref/2)),y2,(mpref/2),buth,
 			&(U.flag), 0, 0, 0, 0, "Link new objects' material to the object block");
 		uiBlockEndAlign(block);
+		uiBlockEndAlign(block);
+		
+		uiDefButBitI(block, TOGN, USER_ADD_OB_AUTOEDIT, B_DRAWINFO, "Auto Edit New Objects",
+			(xpos+edgsp),y1,mpref,buth,
+			&(U.flag), 0, 0, 0, 0, "Automatically enter Edit Mode when adding new objects");
 
 
 		uiDefBut(block, LABEL,0,"Undo:",