Index: modules/simpletest/tests/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v
retrieving revision 1.17
diff -u -p -r1.17 menu.test
--- modules/simpletest/tests/menu.test	30 Sep 2009 13:09:30 -0000	1.17
+++ modules/simpletest/tests/menu.test	1 Oct 2009 10:44:21 -0000
@@ -157,7 +157,9 @@ class MenuIncTestCase extends DrupalWebT
    * Test menu_get_names().
    */
   function testMenuGetNames() {
-    $this->assertEqual(menu_get_names(), array('admin_shortcuts', 'main-menu', 'management', 'navigation', 'original', 'user-menu'), t('Expected menu names were returned.'));
+    // The main-menu is there but has no items by default, so not returned by
+    // menu_get_names(). Therefore we cannot check for that.
+    $this->assertEqual(menu_get_names(), array('admin_shortcuts', 'management', 'navigation', 'original', 'user-menu'), t('Expected menu names were returned.'));
   }
 
   /**
Index: profiles/default/default.install
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.install,v
retrieving revision 1.7
diff -u -p -r1.7 default.install
--- profiles/default/default.install	28 Sep 2009 22:14:31 -0000	1.7
+++ profiles/default/default.install	1 Oct 2009 10:44:21 -0000
@@ -205,10 +205,6 @@ function default_install() {
   // Update the menu router information.
   menu_rebuild();
 
-  // Save some default links.
-  $link = array('link_path' => 'admin/structure/menu/manage/main-menu/add', 'link_title' => 'Add a main menu link', 'menu_name' => 'main-menu');
-  menu_link_save($link);
-
   // Enable the admin theme.
   db_update('system')
     ->fields(array('status' => 1))