Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.286
diff -u -p -r1.286 locale.module
--- modules/locale/locale.module	7 Mar 2010 18:52:27 -0000	1.286
+++ modules/locale/locale.module	13 Mar 2010 18:35:42 -0000
@@ -386,7 +386,7 @@ function locale_form_alter(&$form, &$for
       locale_language_selector_form($form, $form_state, $form['#user']);
     }
   }
-  if (isset($form['#id']) && $form['#id'] == 'node-form') {
+  if (!empty($form['#node_edit_form'])) {
     if (isset($form['#node']->type) && locale_multilingual_node_type($form['#node']->type)) {
       $form['language'] = array(
         '#type' => 'select',
Index: modules/node/node.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.css,v
retrieving revision 1.14
diff -u -p -r1.14 node.css
--- modules/node/node.css	9 Mar 2010 11:45:37 -0000	1.14
+++ modules/node/node.css	13 Mar 2010 18:36:02 -0000
@@ -28,9 +28,6 @@ td.revision-current {
   display: inline;
   width: auto;
 }
-.node-form .standard {
-  clear: both;
-}
 .node-form .attachments fieldset {
   float: none;
   display: block;
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1246
diff -u -p -r1.1246 node.module
--- modules/node/node.module	12 Mar 2010 15:56:29 -0000	1.1246
+++ modules/node/node.module	13 Mar 2010 18:36:30 -0000
@@ -143,10 +143,6 @@ function node_theme() {
       'variables' => array('content' => NULL),
       'file' => 'node.pages.inc',
     ),
-    'node_form' => array(
-      'render element' => 'form',
-      'file' => 'node.pages.inc',
-    ),
     'node_preview' => array(
       'variables' => array('node' => NULL),
       'file' => 'node.pages.inc',
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.117
diff -u -p -r1.117 node.pages.inc
--- modules/node/node.pages.inc	27 Feb 2010 20:37:11 -0000	1.117
+++ modules/node/node.pages.inc	13 Mar 2010 18:36:48 -0000
@@ -108,9 +108,12 @@ function node_form($form, &$form_state, 
     $node->in_preview = TRUE;
   }
 
-  // Set the id and identify this as a node edit form.
-  $form['#id'] = 'node-form';
+  // Identify this as a node edit form.
   $form['#node_edit_form'] = TRUE;
+  $form['#attributes']['class'][] = 'node-form';
+  if (!empty($node->type)) {
+    $form['#attributes']['class'][] = 'node-' . $node->type . '-form';
+  }
 
   // Basic node information.
   // These elements are just values so they are not even sent to the client.
@@ -292,25 +295,6 @@ function node_form_build_preview($form, 
 }
 
 /**
- * Present a node submission form.
- *
- * @ingroup themeable
- */
-function theme_node_form($variables) {
-  $form = $variables['form'];
-
-  $output = "\n<div class=\"node-form\">\n";
-
-  $output .= "  <div class=\"standard\">\n";
-  $output .= drupal_render_children($form);
-  $output .= "  </div>\n";
-
-  $output .= "</div>\n";
-
-  return $output;
-}
-
-/**
  * Generate a node preview.
  */
 function node_preview($node) {
Index: modules/translation/translation.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/translation/translation.module,v
retrieving revision 1.76
diff -u -p -r1.76 translation.module
--- modules/translation/translation.module	7 Mar 2010 07:44:18 -0000	1.76
+++ modules/translation/translation.module	13 Mar 2010 18:36:10 -0000
@@ -123,7 +123,7 @@ function translation_form_node_type_form
  *   is about to be created.
  */
 function translation_form_alter(&$form, &$form_state, $form_id) {
-  if (isset($form['#id']) && $form['#id'] == 'node-form' && translation_supported_type($form['#node']->type)) {
+  if (!empty($form['#node_edit_form']) && translation_supported_type($form['#node']->type)) {
     $node = $form['#node'];
     if (!empty($node->translation_source)) {
       // We are creating a translation. Add values and lock language field.