Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.84
diff -u -p -r1.84 node.pages.inc
--- modules/node/node.pages.inc	3 Oct 2009 17:45:26 -0000	1.84
+++ modules/node/node.pages.inc	5 Oct 2009 19:18:51 -0000
@@ -127,9 +127,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.
@@ -314,23 +317,6 @@ function node_form_build_preview($form, 
 }
 
 /**
- * Present a node submission form.
- *
- * @ingroup themeable
- */
-function theme_node_form($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) {