Index: profiles/default/default.profile
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v
retrieving revision 1.48
diff -u -r1.48 default.profile
--- profiles/default/default.profile	27 Jun 2009 11:11:53 -0000	1.48
+++ profiles/default/default.profile	27 Jun 2009 15:12:29 -0000
@@ -232,10 +232,6 @@
 
   // 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);
 }
 
 /**
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.496
diff -u -r1.496 theme.inc
--- includes/theme.inc	18 Jun 2009 21:19:02 -0000	1.496
+++ includes/theme.inc	27 Jun 2009 15:12:29 -0000
@@ -1965,6 +1965,13 @@
     $variables['node'] = $node;
   }
 
+  if (!count($variables['main_menu']) && variable_get('menu_main_links_source', 'main-menu') == 'main-menu') {
+    $variables['main_menu'][]= array(
+      'href' => 'admin/build/menu-customize/main-menu/add',
+      'title' => 'Add a main menu link',
+    );
+  }
+
   // Compile a list of classes that are going to be applied to the body element.
   // This allows advanced theming based on context (home page, node of certain type, etc.).
   // Add a class that tells us whether we're on the front page or not.