Index: includes/theme.maintenance.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v
retrieving revision 1.45
diff -u -p -r1.45 theme.maintenance.inc
--- includes/theme.maintenance.inc	19 Nov 2009 03:11:53 -0000	1.45
+++ includes/theme.maintenance.inc	19 Nov 2009 04:58:26 -0000
@@ -11,8 +11,8 @@
  * in maintenance mode. It also applies when the database is unavailable.
  *
  * Seven is always used for the initial install and update operations. In
- * other cases, "settings.php" must have a "maintenance_theme" key set for the
- * $conf variable in order to change the maintenance theme.
+ * other cases, Minnelli is used, but this can be overridden by setting a
+ * "maintenance_theme" key in the $conf variable in settings.php.
  */
 function _drupal_maintenance_theme() {
   global $theme, $theme_key;
@@ -46,7 +46,7 @@ function _drupal_maintenance_theme() {
       drupal_load('module', 'filter');
     }
 
-    $custom_theme = variable_get('maintenance_theme', 'seven');
+    $custom_theme = variable_get('maintenance_theme', 'minnelli');
   }
 
   $themes = list_themes();
Index: modules/simpletest/tests/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v
retrieving revision 1.21
diff -u -p -r1.21 menu.test
--- modules/simpletest/tests/menu.test	19 Nov 2009 03:11:53 -0000	1.21
+++ modules/simpletest/tests/menu.test	19 Nov 2009 04:58:26 -0000
@@ -60,7 +60,7 @@ class MenuIncTestCase extends DrupalWebT
     // For a regular user, the fact that the site is in maintenance mode means
     // we expect the theme callback system to be bypassed entirely.
     $this->drupalGet('menu-test/theme-callback/use-admin-theme');
-    $this->assertRaw('seven/style.css', t("The maintenance theme's CSS appears on the page."));
+    $this->assertRaw('minnelli/minnelli.css', t("The maintenance theme's CSS appears on the page."));
 
     // An administrator, however, should continue to see the requested theme.
     $admin_user = $this->drupalCreateUser(array('access site in maintenance mode'));