Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.38
diff -u -p -r1.38 menu.admin.inc
--- modules/menu/menu.admin.inc	3 Feb 2009 18:55:30 -0000	1.38
+++ modules/menu/menu.admin.inc	27 Feb 2009 17:12:31 -0000
@@ -612,6 +612,15 @@ function menu_configure() {
     '#description' => t('Choose the menu to be the default in the menu options in the content authoring form.'),
   );
 
+  $form['menu_default_node_menu_available_menus'] = array(
+    '#type' => 'select',
+    '#title' => t('Only show these menus'),
+    '#default_value' => variable_get('menu_default_node_menu_available_menus', array('main-menu' => 'main-menu')),
+    '#options' => $menu_options,
+    '#description' => t('Choose the menus that will appear in the menu options in the content authoring form.'),
+    '#multiple' => TRUE,
+  );
+
   $main = variable_get('menu_main_links_source', 'main-menu');
   $main_options = array_merge($menu_options, array('' => t('No Main links')));
   $form['menu_main_links_source'] = array(
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.178
diff -u -p -r1.178 menu.module
--- modules/menu/menu.module	31 Jan 2009 16:56:00 -0000	1.178
+++ modules/menu/menu.module	27 Feb 2009 17:12:31 -0000
@@ -213,10 +213,14 @@ function menu_parent_options($menus, $it
     $limit = _menu_parent_depth_limit($item);
   }
 
+  $available_menus = variable_get('menu_default_node_menu_available_menus', array('main-menu' => 'main-menu'));
+  $in_admin_page = arg(0) == 'admin';
   foreach ($menus as $menu_name => $title) {
-    $tree = menu_tree_all_data($menu_name, NULL);
-    $options[$menu_name . ':0'] = '<' . $title . '>';
-    _menu_parents_recurse($tree, $menu_name, '--', $options, $item['mlid'], $limit);
+    if (isset($available_menus[$menu_name]) || $in_admin_page) {
+      $tree = menu_tree_all_data($menu_name, NULL);
+      $options[$menu_name . ':0'] = '<' . $title . '>';
+      _menu_parents_recurse($tree, $menu_name, '--', $options, $item['mlid'], $limit);
+		}
   }
   return $options;
 }
Index: profiles/default/default.profile
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v
retrieving revision 1.37
diff -u -p -r1.37 default.profile
--- profiles/default/default.profile	3 Feb 2009 12:30:14 -0000	1.37
+++ profiles/default/default.profile	27 Feb 2009 17:12:31 -0000
@@ -152,12 +152,6 @@ function default_profile_tasks(&$task, $
 
   // Update the menu router information.
   menu_rebuild();
-
-  // Save some default links.
-  $link = array('link_path' => 'admin/build/menu-customize/main-menu/add', 'link_title' => 'Add a main menu link', 'menu_name' => 'main-menu');
-  menu_link_save($link);
-  $link = array('link_path' => 'admin/build/menu-customize/secondary-menu/add', 'link_title' => 'Add a secondary menu link', 'menu_name' => 'secondary-menu');
-  menu_link_save($link);
 }
 
 /**