### Eclipse Workspace Patch 1.0
#P Test Drupal 6
Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.45
diff -u -r1.45 install.php
--- install.php	10 May 2007 19:55:23 -0000	1.45
+++ install.php	11 May 2007 07:20:07 -0000
@@ -584,7 +584,6 @@
 
   if ($task == 'configure') {
     drupal_set_title(st('Configure site'));
-    menu_rebuild();
 
     // We break the form up so we can tell when it's been successfully
     // submitted.
@@ -634,6 +633,7 @@
 
     // The end of the install process. Remember profile used.
     if ($task == 'done') {
+      menu_rebuild();
       variable_set('install_profile', $profile);
     }
 
@@ -679,7 +679,7 @@
     'profile' => st('Choose profile'),
     'locale' => st('Choose language'),
     'requirements' => st('Verify requirements'),
-    'database' => st('Database setup'),
+    'database' => st('Setup database'),
     'configure' => st('Configure site'),
   );
 
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.104
diff -u -r1.104 system.install
--- modules/system/system.install	10 May 2007 19:55:23 -0000	1.104
+++ modules/system/system.install	11 May 2007 07:20:14 -0000
@@ -3871,6 +3871,8 @@
   // Rebuild system table contents.
   module_rebuild_cache();
   system_theme_data();
+
+  return array();
 }
 
 /**
@@ -3879,6 +3881,8 @@
  */
 function system_update_6014() {
   variable_set('install_task', 'done');
+
+  return array();
 }