Index: profiles/default/default.profile
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v
retrieving revision 1.55
diff -u -r1.55 default.profile
--- profiles/default/default.profile	15 Jul 2009 02:08:41 -0000	1.55
+++ profiles/default/default.profile	18 Jul 2009 14:57:22 -0000
@@ -167,10 +167,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.499
diff -u -r1.499 theme.inc
--- includes/theme.inc	15 Jul 2009 17:40:17 -0000	1.499
+++ includes/theme.inc	18 Jul 2009 14:57:22 -0000
@@ -1938,7 +1938,19 @@
   $variables['language']->dir     = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
   $variables['logo']              = theme_get_setting('logo');
   $variables['messages']          = $variables['show_messages'] ? theme('status_messages') : '';
-  $variables['main_menu']         = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array();
+  $variables['main_menu']         = array();
+  if (theme_get_setting('toggle_main_menu')) {
+    $variables['main_menu'] = menu_main_menu();
+    // Add a menu helper item when main menu is still empty
+    if (empty($variables['main_menu']) && variable_get('menu_main_links_source', 'main-menu') == 'main-menu') {
+      $variables['main_menu']= array(
+        array(
+          'href' => 'admin/build/menu-customize/main-menu/add',
+          'title' => t('Add a main menu link'),
+        ),
+      );
+    }
+  }
   $variables['secondary_menu']    = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array();
   $variables['search_box']        = (theme_get_setting('toggle_search') ? drupal_render(drupal_get_form('search_theme_form')) : '');
   $variables['site_name']         = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'Drupal')) : '');