Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.228
diff -u -p -r1.228 form.inc
--- includes/form.inc	5 Oct 2007 09:35:08 -0000	1.228
+++ includes/form.inc	5 Oct 2007 18:57:48 -0000
@@ -814,7 +814,12 @@ function _form_builder_handle_input_elem
     array_unshift($form['#parents'], $name);
   }
   if (!isset($form['#id'])) {
-    $form['#id'] = form_clean_id('edit-'. implode('-', $form['#parents']));
+    if ($form['#type'] == 'submit') {
+      $form['#id'] = form_clean_id('edit-'. $form_id .'-submit');
+    }
+    else {
+      $form['#id'] = form_clean_id('edit-'. implode('-', $form['#parents']));
+    }
   }
 
   unset($edit);
Index: misc/maintenance.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/misc/maintenance.tpl.php,v
retrieving revision 1.5
diff -u -p -r1.5 maintenance.tpl.php
--- misc/maintenance.tpl.php	1 Sep 2007 05:42:48 -0000	1.5
+++ misc/maintenance.tpl.php	5 Oct 2007 18:48:05 -0000
@@ -41,7 +41,7 @@
 
           <?php if ($messages): print $messages; endif; ?>
           <?php print $content ?>
-          <span class="clear"></span>
+          <div class="clear"></div>
 
           <!--partial-->
 
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.890
diff -u -p -r1.890 node.module
--- modules/node/node.module	3 Oct 2007 17:35:22 -0000	1.890
+++ modules/node/node.module	5 Oct 2007 18:48:22 -0000
@@ -58,12 +58,12 @@ function node_help($path, $arg) {
     case 'node/%/edit':
       $node = node_load($arg[1]);
       $type = node_get_types('type', $node->type);
-      return '<p>'. (isset($type->help) ? filter_xss_admin($type->help) : '') .'</p>';
+      return (!empty($type->help) ? '<p>'. filter_xss_admin($type->help) .'</p>' : '');
   }
 
   if ($arg[0] == 'node' && $arg[1] == 'add' && $arg[2]) {
     $type = node_get_types('type', str_replace('-', '_', $arg[2]));
-    return '<p>'. (isset($type->help) ? filter_xss_admin($type->help) : '') .'</p>';
+    return (!empty($type->help) ? '<p>'. filter_xss_admin($type->help) .'</p>' : '');
   }
 }
 
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.15
diff -u -p -r1.15 template.php
--- themes/garland/template.php	2 Oct 2007 16:03:17 -0000	1.15
+++ themes/garland/template.php	5 Oct 2007 18:48:39 -0000
@@ -54,7 +54,7 @@ function phptemplate_comment_wrapper($co
  */
 function phptemplate_preprocess_page(&$vars) {
   if ($secondary = menu_secondary_local_tasks()) {
-    $output = '<span class="clear"></span>';
+    $output = '<div class="clear"></div>';
     $output .= "<ul class=\"tabs secondary\">\n". $secondary ."</ul>\n";
     $vars['tabs2'] = $output;
   }