Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.57
diff -u -p -r1.57 content_types.inc
--- modules/node/content_types.inc	16 Jul 2008 21:59:27 -0000	1.57
+++ modules/node/content_types.inc	10 Sep 2008 03:41:10 -0000
@@ -319,7 +319,6 @@ function node_type_form_submit($form, &$
   }
 
   node_types_rebuild();
-  menu_rebuild();
   $t_args = array('%name' => $type->name);
 
   if ($op == t('Reset to defaults')) {
@@ -404,7 +403,6 @@ function node_type_delete_confirm_submit
   watchdog('menu', 'Deleted content type %name.', $t_args, WATCHDOG_NOTICE);
 
   node_types_rebuild();
-  menu_rebuild();
 
   $form_state['redirect'] = 'admin/build/types';
   return;
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.974
diff -u -p -r1.974 node.module
--- modules/node/node.module	6 Sep 2008 08:36:20 -0000	1.974
+++ modules/node/node.module	10 Sep 2008 03:41:11 -0000
@@ -493,6 +493,8 @@ function node_types_rebuild() {
   }
 
   _node_types_build();
+  // This is required for proper menu items at node/add/type.
+  menu_rebuild();
 }
 
 /**
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.87
diff -u -p -r1.87 system.admin.inc
--- modules/system/system.admin.inc	6 Sep 2008 08:36:21 -0000	1.87
+++ modules/system/system.admin.inc	10 Sep 2008 03:41:11 -0000
@@ -609,7 +609,6 @@ function system_modules($form_state = ar
   registry_rebuild();
   drupal_theme_rebuild();
   node_types_rebuild();
-  menu_rebuild();
   cache_clear_all('schema', 'cache');
   // Get current list of modules.
   $files = module_rebuild_cache();
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.791
diff -u -p -r1.791 common.inc
--- includes/common.inc	8 Sep 2008 21:24:30 -0000	1.791
+++ includes/common.inc	10 Sep 2008 03:41:11 -0000
@@ -3533,7 +3533,7 @@ function drupal_flush_all_caches() {
   drupal_clear_js_cache();
   system_theme_data();
   drupal_theme_rebuild();
-  menu_rebuild();
+  // Rebuild content types, menu will be rebuilt as well.
   node_types_rebuild();
   // Don't clear cache_form - in-progress form submissions may break.
   // Ordered so clearing the page cache will always be the last action.