Index: themes/seven/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/template.php,v
retrieving revision 1.12
diff -u -r1.12 template.php
--- themes/seven/template.php	4 Jan 2010 03:46:31 -0000	1.12
+++ themes/seven/template.php	25 Feb 2010 15:06:50 -0000
@@ -80,8 +80,9 @@
 
   $output = '<fieldset' . drupal_attributes($element['#attributes']) . '>';
   if (!empty($element['#title'])) {
-    $output .= '<legend><span>' . $element['#title'] . '</span></legend>';
+    $output .= '<legend>' . $element['#title'] . '</legend>';
   }
+  $output .= '<div class="fieldset-content clearfix">';
   if (!empty($element['#description'])) {
     $output .= '<div class="fieldset-description">' . $element['#description'] . '</div>';
   }
@@ -89,7 +90,7 @@
   if (isset($element['#value'])) {
     $output .= $element['#value'];
   }
-  $output .= "</fieldset>\n";
+  $output .= "</div></fieldset>\n";
   return $output;
 }
 
Index: themes/seven/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/style.css,v
retrieving revision 1.45
diff -u -r1.45 style.css
--- themes/seven/style.css	17 Feb 2010 03:37:12 -0000	1.45
+++ themes/seven/style.css	25 Feb 2010 15:06:50 -0000
@@ -607,49 +607,83 @@
  */
 
 /* Fieldsets & Form items */
-fieldset {
-  border: 1px solid #ccc;
-  padding: 30px 13px 13px 14px;
-  margin: 0 0 10px;
+fieldset,
+fieldset.collapsed,
+html.js fieldset.collapsed {
+  margin: 0;
+  padding: 0 0 10px 0;
 }
-
-fieldset legend span,
-fieldset legend a {
+fieldset legend {
   position: absolute;
-  margin-top: 9px;
+  padding: 0 16px;
+  text-transform: uppercase;
+  line-height: 32px;
+}
+fieldset .fieldset-content,
+html.js fieldset.collapsed legend {
+  position: static;
+  display: block;
+  margin: 0;
+  padding: 10px 16px 13px 16px;
+  border: 1px solid #ccc;
+}
+fieldset legend + .fieldset-content,
+fieldset legend + .fieldset-wrapper > .fieldset-content {
+  padding-top: 32px;
 }
 
-fieldset legend a span {
-  position: relative;
-  margin-top: 0;
+html.js fieldset.collapsible .fieldset-wrapper {
+  overflow: visible;
 }
 
 fieldset.collapsed {
   background: transparent;
 }
+html.js fieldset.collapsed {
+  height: 32px;
+  padding-right: 34px;
+}
+html.js fieldset.collapsed legend {
+  float: left;
+  width: 100%;
+  padding: 0 16px;
+}
 
-html.js fieldset.collapsed legend,
-html.js fieldset.collapsed legend * {
+/* IE7 fix. */
+*:first-child+html fieldset legend {
+  margin: 0 -41px 0 -7px;
+}
+*:first-child+html.js fieldset.collapsed legend {
+  margin: -12px -41px 0 -7px;
+}
+*:first-child+html fieldset .fieldset-content {
   display: block;
 }
-html.js fieldset.collapsed {
-  border-width: 1px;
-  margin-bottom: 10px;
-  padding: 13px;
+/* IE6 fix. */
+* html.js fieldset.collapsible,
+* html.js fieldset.collapsed legend {
+  margin: 0 -41px 0 -7px;
+}
+* html.js fieldset.collapsed {
+  margin: -12px -41px 0 -7px;
+}
+* html.js fieldset .fieldset-content {
+  padding-top: 32px;
+}
+
+html.js .vertical-tabs-panes fieldset .fieldset-content {
+  margin: 0;
+  padding: 0;
+  border: 0;
 }
 
 fieldset fieldset {
   background: #fff;
 }
-
 fieldset fieldset fieldset {
   background: #f8f8f8;
 }
 
-html.js fieldset.collapsible .fieldset-wrapper {
-  overflow: visible;
-}
-
 div.form-item {
   padding: 9px 0;
   margin: 0 0 10px;
@@ -673,10 +707,6 @@
   padding: 0;
 }
 
-fieldset legend {
-  text-transform: uppercase;
-}
-
 div.form-item label.option {
   text-transform: none;
 }
@@ -930,6 +960,9 @@
   width: 550px;
   padding-right: 20px;
 }
+*:first-child+html body.in-maintenance #content {
+  
+}
 body.in-maintenance #page {
   overflow: auto;
   width: 770px;
Index: modules/simpletest/simpletest.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.test,v
retrieving revision 1.37
diff -u -r1.37 simpletest.test
--- modules/simpletest/simpletest.test	24 Dec 2009 08:03:53 -0000	1.37
+++ modules/simpletest/simpletest.test	25 Feb 2010 15:06:50 -0000
@@ -208,11 +208,11 @@
     if ($this->parse()) {
       if ($fieldset = $this->getResultFieldSet()) {
         // Code assumes this is the only test in group.
-        $results['summary'] = $this->asText($fieldset->div[1]);
+        $results['summary'] = $this->asText($fieldset->div->div[1]);
         $results['name'] = $this->asText($fieldset->legend);
 
         $results['assertions'] = array();
-        $tbody = $fieldset->table->tbody;
+        $tbody = $fieldset->div->table->tbody;
         foreach ($tbody->tr as $row) {
           $assertion = array();
           $assertion['message'] = $this->asText($row->td[0]);