Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.99
diff -u -r1.99 user.admin.inc
--- modules/user/user.admin.inc	7 Feb 2010 17:29:09 -0000	1.99
+++ modules/user/user.admin.inc	2 Mar 2010 15:41:43 -0000
@@ -168,8 +168,7 @@
   $form['options'] = array(
     '#type' => 'fieldset',
     '#title' => t('Update options'),
-    '#prefix' => '<div class="container-inline">',
-    '#suffix' => '</div>',
+    '#attributes' => array('class' => array('container-inline')),
   );
   $options = array();
   foreach (module_invoke_all('user_operations') as $operation => $array) {
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.338
diff -u -r1.338 search.module
--- modules/search/search.module	17 Feb 2010 22:44:52 -0000	1.338
+++ modules/search/search.module	2 Mar 2010 15:41:42 -0000
@@ -901,19 +901,18 @@
   $form['#action'] = $action;
   $form['#attributes']['class'][] = 'search-form';
   $form['module'] = array('#type' => 'value', '#value' => $type);
-  $form['basic'] = array('#type' => 'item', '#title' => $prompt, '#id' => 'edit-keys');
-  $form['basic']['inline'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>');
-  $form['basic']['inline']['keys'] = array(
+  $form['basic'] = array('#type' => 'container', '#attributes' => array('class' => array('container-inline')));
+  $form['basic']['keys'] = array(
     '#type' => 'textfield',
-    '#title' => '',
+    '#title' => $prompt,
     '#default_value' => $keys,
     '#size' => $prompt ? 40 : 20,
     '#maxlength' => 255,
   );
   // processed_keys is used to coordinate keyword passing between other forms
   // that hook into the basic search form.
-  $form['basic']['inline']['processed_keys'] = array('#type' => 'value', '#value' => array());
-  $form['basic']['inline']['submit'] = array('#type' => 'submit', '#value' => t('Search'));
+  $form['basic']['processed_keys'] = array('#type' => 'value', '#value' => array());
+  $form['basic']['submit'] = array('#type' => 'submit', '#value' => t('Search'));
 
   return $form;
 }
Index: modules/search/search.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.pages.inc,v
retrieving revision 1.15
diff -u -r1.15 search.pages.inc
--- modules/search/search.pages.inc	13 Jan 2010 05:40:03 -0000	1.15
+++ modules/search/search.pages.inc	2 Mar 2010 15:41:42 -0000
@@ -122,7 +122,7 @@
  * value for the basic search form.
  */
 function search_form_validate($form, &$form_state) {
-  form_set_value($form['basic']['inline']['processed_keys'], trim($form_state['values']['keys']), $form_state);
+  form_set_value($form['basic']['processed_keys'], trim($form_state['values']['keys']), $form_state);
 }
 
 /**
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	2 Mar 2010 15:41:43 -0000
@@ -856,10 +856,6 @@
   padding-bottom: 9px;
 }
 
-.container-inline fieldset {
-  display: block;
-}
-
 /* admin/appearance */
 #system-themes-page h2 {
   font-weight: normal;
Index: modules/node/node.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v
retrieving revision 1.90
diff -u -r1.90 node.admin.inc
--- modules/node/node.admin.inc	15 Feb 2010 16:36:48 -0000	1.90
+++ modules/node/node.admin.inc	2 Mar 2010 15:41:41 -0000
@@ -388,8 +388,7 @@
   $form['options'] = array(
     '#type' => 'fieldset',
     '#title' => t('Update options'),
-    '#prefix' => '<div class="container-inline">',
-    '#suffix' => '</div>',
+    '#attributes' => array('class' => array('container-inline')),
     '#access' => $admin_access,
   );
   $options = array();
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1239
diff -u -r1.1239 node.module
--- modules/node/node.module	27 Feb 2010 20:37:11 -0000	1.1239
+++ modules/node/node.module	2 Mar 2010 15:41:42 -0000
@@ -2611,7 +2611,7 @@
     $keys .= ' "' . str_replace('"', ' ', $form_state['values']['phrase']) . '"';
   }
   if (!empty($keys)) {
-    form_set_value($form['basic']['inline']['processed_keys'], trim($keys), $form_state);
+    form_set_value($form['basic']['processed_keys'], trim($keys), $form_state);
   }
 }
 
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.259
diff -u -r1.259 system.admin.inc
--- modules/system/system.admin.inc	15 Feb 2010 15:07:57 -0000	1.259
+++ modules/system/system.admin.inc	2 Mar 2010 15:41:43 -0000
@@ -2900,8 +2900,7 @@
   $form['parent'] = array(
     '#type' => 'fieldset',
     '#title' => t('Create an advanced action'),
-    '#prefix' => '<div class="container-inline">',
-    '#suffix' => '</div>',
+    '#attributes' => array('class' => array('container-inline')),
   );
   $form['parent']['action'] = array(
     '#type' => 'select',
Index: modules/system/system-behavior.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system-behavior.css,v
retrieving revision 1.4
diff -u -r1.4 system-behavior.css
--- modules/system/system-behavior.css	16 Feb 2010 01:05:52 -0000	1.4
+++ modules/system/system-behavior.css	2 Mar 2010 15:41:42 -0000
@@ -267,9 +267,13 @@
 /**
  * Inline items (need to override above)
  */
-.container-inline div, .container-inline label {
+.container-inline div,
+.container-inline label {
   display: inline;
 }
+.container-inline .fieldset-wrapper {
+  display: block;
+}
 
 .nowrap {
   white-space: nowrap;
Index: modules/path/path.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.admin.inc,v
retrieving revision 1.41
diff -u -r1.41 path.admin.inc
--- modules/path/path.admin.inc	21 Jan 2010 04:20:08 -0000	1.41
+++ modules/path/path.admin.inc	2 Mar 2010 15:41:42 -0000
@@ -231,23 +231,23 @@
 function path_admin_filter_form($form, &$form_state, $keys = '') {
   $form['#attributes'] = array('class' => array('search-form'));
   $form['basic'] = array('#type' => 'fieldset',
-    '#title' => t('Filter aliases')
+    '#title' => t('Filter aliases'),
+    '#attributes' => array('class' => array('container-inline')),
   );
-  $form['basic']['inline'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>');
-  $form['basic']['inline']['filter'] = array(
+  $form['basic']['filter'] = array(
     '#type' => 'textfield',
     '#title' => '',
     '#default_value' => $keys,
     '#maxlength' => 128,
     '#size' => 25,
   );
-  $form['basic']['inline']['submit'] = array(
+  $form['basic']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Filter'),
     '#submit' => array('path_admin_filter_form_submit_filter'),
     );
   if ($keys) {
-    $form['basic']['inline']['reset'] = array(
+    $form['basic']['reset'] = array(
       '#type' => 'submit',
       '#value' => t('Reset'),
       '#submit' => array('path_admin_filter_form_submit_reset'),
Index: modules/comment/comment.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v
retrieving revision 1.43
diff -u -r1.43 comment.admin.inc
--- modules/comment/comment.admin.inc	22 Feb 2010 15:38:52 -0000	1.43
+++ modules/comment/comment.admin.inc	2 Mar 2010 15:41:41 -0000
@@ -39,8 +39,7 @@
   $form['options'] = array(
     '#type' => 'fieldset',
     '#title' => t('Update options'),
-    '#prefix' => '<div class="container-inline">',
-    '#suffix' => '</div>',
+    '#attributes' => array('class' => array('container-inline')),
   );
   $options = array();
   foreach (comment_operations($arg == 'approval' ? 'publish' : 'unpublish') as $key => $value) {
Index: modules/trigger/trigger.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.admin.inc,v
retrieving revision 1.21
diff -u -r1.21 trigger.admin.inc
--- modules/trigger/trigger.admin.inc	6 Nov 2009 03:59:06 -0000	1.21
+++ modules/trigger/trigger.admin.inc	2 Mar 2010 15:41:43 -0000
@@ -160,8 +160,8 @@
   }
 
   $form[$hook]['parent'] = array(
-    '#prefix' => "<div class='container-inline'>",
-    '#suffix' => '</div>',
+    '#type' => 'container',
+    '#attributes' => array('class' => array('container-inline')),
   );
   // List possible actions that may be assigned.
   if (count($options) != 0) {