Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.237
diff -u -p -r1.237 locale.module
--- modules/locale/locale.module	5 Feb 2009 00:32:46 -0000	1.237
+++ modules/locale/locale.module	20 Feb 2009 23:42:30 -0000
@@ -288,19 +288,20 @@ function locale_form_node_type_form_alte
 function locale_form_alter(&$form, &$form_state, $form_id) {
   if (isset($form['#id']) && $form['#id'] == 'node-form') {
     if (isset($form['#node']->type) && variable_get('language_content_type_' . $form['#node']->type, 0)) {
+      // Multilingual node.
+      $default = language_default();
       $form['language'] = array(
         '#type' => 'select',
         '#title' => t('Language'),
-        '#default_value' => (isset($form['#node']->language) ? $form['#node']->language : ''),
+        '#default_value' => (isset($form['#node']->language) ? $form['#node']->language : $default->language),
         '#options' => array('' => t('Language neutral')) + locale_language_list('name'),
       );
     }
-    // Node type without language selector: assign the default for new nodes
+    // Node without multilingual support: assign 'Language neutral' for new nodes.
     elseif (!isset($form['#node']->nid)) {
-      $default = language_default();
       $form['language'] = array(
         '#type' => 'value',
-        '#value' => $default->language
+        '#value' => '',
       );
     }
   }