Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.20
diff -u -p -r1.20 menu.admin.inc
--- modules/menu/menu.admin.inc	11 Dec 2007 12:17:58 -0000	1.20
+++ modules/menu/menu.admin.inc	15 Dec 2007 23:48:37 -0000
@@ -605,7 +605,7 @@ function menu_configure() {
   $menu_options = menu_get_menus();
   $form['menu_default_node_menu'] = array('#type' => 'select',
     '#title' => t('Default menu for content'),
-    '#default_value' => variable_get('menu_default_node_menu', 'navigation'),
+    '#default_value' => variable_get('menu_default_node_menu', 'primary-links'),
     '#options' => $menu_options,
     '#description' => t('Choose the menu to be the default in the menu options in the content authoring form.'),
   );
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.152
diff -u -p -r1.152 menu.module
--- modules/menu/menu.module	14 Dec 2007 18:08:47 -0000	1.152
+++ modules/menu/menu.module	15 Dec 2007 23:48:38 -0000
@@ -319,7 +319,7 @@ function menu_nodeapi(&$node, $op) {
     case 'prepare':
       if (empty($node->menu)) {
         // Prepare the node for the edit form so that $node->menu always exists.
-        $menu_name = variable_get('menu_default_node_menu', 'navigation');
+        $menu_name = variable_get('menu_default_node_menu', 'primary-links');
         $item = array();
         if (isset($node->nid)) {
           // Give priority to the default menu
@@ -396,7 +396,7 @@ function menu_form_alter(&$form, $form_s
     $options = menu_parent_options(menu_get_menus(), $item);
     $default = $item['menu_name'] .':'. $item['plid'];
     if (!isset($options[$default])) {
-      $default = 'navigation:0';
+      $default = 'primary-links:0';
     }
     $form['menu']['parent'] = array(
       '#type' => 'select',