? system.admin.inc.norebuild
? system.admin.inc.stopwatch
Index: system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.63.2.7
diff -u -p -r1.63.2.7 system.admin.inc
--- system.admin.inc	25 Feb 2009 11:38:41 -0000	1.63.2.7
+++ system.admin.inc	4 Jun 2009 02:52:28 -0000
@@ -620,7 +620,6 @@ function _system_is_incompatible(&$incom
 function system_modules($form_state = array()) {
   drupal_rebuild_theme_registry();
   node_types_rebuild();
-  menu_rebuild();
   cache_clear_all('schema', 'cache');
   // Get current list of modules.
   $files = module_rebuild_cache();
@@ -930,6 +929,7 @@ function system_modules_submit($form, &$
 
   $current_module_list = module_list(TRUE, FALSE);
   if ($old_module_list != $current_module_list) {
+    menu_rebuild();
     drupal_set_message(t('The configuration options have been saved.'));
   }