Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.406
diff -u -p -r1.406 menu.inc
--- includes/menu.inc	22 Aug 2010 14:57:44 -0000	1.406
+++ includes/menu.inc	23 Aug 2010 10:29:31 -0000
@@ -1617,7 +1617,6 @@ function menu_list_system_menus() {
     'management' => 'Management',
     'user-menu' => 'User menu',
     'main-menu' => 'Main menu',
-    'secondary-menu' => 'Secondary menu',
   );
 }
 
@@ -2077,7 +2076,7 @@ function menu_set_active_menu_names($men
     $active = $menu_names;
   }
   elseif (!isset($active)) {
-    $active = variable_get('menu_default_active_menus', array('management', 'navigation', 'user-menu', 'main-menu'));
+    $active = variable_get('menu_default_active_menus', array_keys(menu_list_system_menus()));
   }
   return $active;
 }
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.606
diff -u -p -r1.606 theme.inc
--- includes/theme.inc	22 Aug 2010 12:46:21 -0000	1.606
+++ includes/theme.inc	23 Aug 2010 10:29:31 -0000
@@ -2266,6 +2266,39 @@ function template_preprocess_page(&$vari
   $variables['tabs']              = theme('menu_local_tasks');
   $variables['title']             = drupal_get_title();
 
+  if (isset($variables['main_menu'])) {
+    $variables['primary_nav'] = theme('links__system_main_menu', array(
+      'links' => $variables['main_menu'],
+      'attributes' => array(
+        'class' => array('links', 'main-menu'),
+      ),
+      'heading' => array(
+        'text' => t('Main menu'),
+        'level' => 'h2',
+        'class' => array('element-invisible'),
+      )
+    ));
+  }
+  else {
+    $variables['primary_nav'] = FALSE;
+  }
+  if (isset($variables['secondary_menu'])) {
+    $variables['secondary_nav'] = theme('links__system_secondary_menu', array(
+      'links' => $variables['secondary_menu'],
+      'attributes' => array(
+        'class' => array('links', 'secondary-menu'),
+      ),
+      'heading' => array(
+        'text' => t('Secondary menu'),
+        'level' => 'h2',
+        'class' => array('element-invisible'),
+      )
+    ));
+  }
+  else {
+    $variables['secondary_nav'] = FALSE;
+  }
+
   if ($node = menu_get_object()) {
     $variables['node'] = $node;
   }
Index: modules/menu/menu.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.install,v
retrieving revision 1.25
diff -u -p -r1.25 menu.install
--- modules/menu/menu.install	10 Jan 2010 17:55:19 -0000	1.25
+++ modules/menu/menu.install	23 Aug 2010 10:29:32 -0000
@@ -52,7 +52,6 @@ function menu_install() {
     'user-menu' => $t("The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link."),
     'management' => $t('The <em>Management</em> menu contains links for administrative tasks.'),
     'main-menu' => $t('The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.'),
-    'secondary-menu' => $t('The <em>Secondary</em> menu is used on many sites for legal notices and contact pages.'),
   );
   foreach ($system_menus as $menu_name => $title) {
     $menu = array(
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.45
diff -u -p -r1.45 page.tpl.php
--- modules/system/page.tpl.php	8 Aug 2010 19:35:49 -0000	1.45
+++ modules/system/page.tpl.php	23 Aug 2010 10:29:32 -0000
@@ -102,9 +102,10 @@
 
     </div></div> <!-- /.section, /#header -->
 
-    <?php if ($main_menu): ?>
+    <?php if ($primary_nav || $secondary_nav): ?>
       <div id="navigation"><div class="section">
-        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
+        <?php if (!empty($primary_nav)): print $primary_nav; endif; ?>
+        <?php if (!empty($secondary_nav)): print $secondary_nav; endif; ?>
       </div></div> <!-- /.section, /#navigation -->
     <?php endif; ?>
 
@@ -144,7 +145,6 @@
     </div></div> <!-- /#main, /#main-wrapper -->
 
     <div id="footer"><div class="section">
-      <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
       <?php print render($page['footer']); ?>
     </div></div> <!-- /.section, /#footer -->
 
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.41
diff -u -p -r1.41 template.php
--- themes/garland/template.php	30 Jul 2010 02:47:28 -0000	1.41
+++ themes/garland/template.php	23 Aug 2010 10:29:32 -0000
@@ -60,38 +60,6 @@ function garland_process_html(&$vars) {
  */
 function garland_preprocess_page(&$vars) {
   $vars['tabs2'] = menu_secondary_local_tasks();
-  if (isset($vars['main_menu'])) {
-    $vars['primary_nav'] = theme('links__system_main_menu', array(
-      'links' => $vars['main_menu'],
-      'attributes' => array(
-        'class' => array('links', 'main-menu'),
-      ),
-      'heading' => array(
-        'text' => t('Main menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      )
-    ));
-  }
-  else {
-    $vars['primary_nav'] = FALSE;
-  }
-  if (isset($vars['secondary_menu'])) {
-    $vars['secondary_nav'] = theme('links__system_secondary_menu', array(
-      'links' => $vars['secondary_menu'],
-      'attributes' => array(
-        'class' => array('links', 'secondary-menu'),
-      ),
-      'heading' => array(
-        'text' => t('Secondary menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      )
-    ));
-  }
-  else {
-    $vars['secondary_nav'] = FALSE;
-  }
 
   // Prepare header.
   $site_fields = array();