Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.211
diff -u -r1.211 locale.module
--- modules/locale/locale.module	9 Jan 2008 11:51:54 -0000	1.211
+++ modules/locale/locale.module	11 Jan 2008 10:09:45 -0000
@@ -219,12 +219,7 @@
       $name = t($item->name);
       $names[$langcode] = $name . ($item->native != $name ? ' ('. $item->native .')' : '');
     }
-    $form['locale'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Language settings'),
-      '#weight' => 1,
-    );
-
+    // The fieldset $form['locale'] has already been created by system_user().
     // Get language negotiation settings.  
     $mode = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE);
     $form['locale']['language'] = array(
@@ -233,6 +228,7 @@
       '#default_value' => $user_preferred_language->language,
       '#options' => $names,
       '#description' => ($mode == LANGUAGE_NEGOTIATION_PATH) ? t("This account's default language for e-mails, and preferred language for site presentation.") : t("This account's default language for e-mails."),
+      '#weight' => 0,
     );
     return $form;
   }
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.578
diff -u -r1.578 system.module
--- modules/system/system.module	10 Jan 2008 23:14:58 -0000	1.578
+++ modules/system/system.module	11 Jan 2008 10:09:46 -0000
@@ -550,18 +550,19 @@
 
     if (variable_get('configurable_timezones', 1)) {
       $zones = _system_zonelist();
-      $form['timezone'] = array(
+      $form['locale'] = array(
         '#type' => 'fieldset',
         '#title' => t('Locale settings'),
         '#weight' => 6,
         '#collapsible' => TRUE,
       );
-      $form['timezone']['timezone'] = array(
+      $form['locale']['timezone'] = array(
         '#type' => 'select',
         '#title' => t('Time zone'),
         '#default_value' => strlen($edit['timezone']) ? $edit['timezone'] : variable_get('date_default_timezone', 0),
         '#options' => $zones,
         '#description' => t('Select your current local time. Dates and times throughout this site will be displayed using this time zone.'),
+        '#weight' => 5,      
       );
     }