Index: modules/dblog/dblog-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog-rtl.css,v
retrieving revision 1.3
diff -u -r1.3 dblog-rtl.css
--- modules/dblog/dblog-rtl.css	2 Sep 2008 16:56:33 -0000	1.3
+++ modules/dblog/dblog-rtl.css	15 Jun 2009 23:29:03 -0000
@@ -1,6 +1,6 @@
 /* $Id: dblog-rtl.css,v 1.3 2008/09/02 16:56:33 dries Exp $ */
 
-#edit-type-wrapper, #edit-severity-wrapper {
+.form-item-type-wrapper, .form-item-severity-wrapper {
   float: right;
   padding-right: 0;
   padding-left: .8em;
Index: modules/dblog/dblog.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.css,v
retrieving revision 1.5
diff -u -r1.5 dblog.css
--- modules/dblog/dblog.css	2 Sep 2008 16:56:33 -0000	1.5
+++ modules/dblog/dblog.css	15 Jun 2009 23:29:03 -0000
@@ -1,6 +1,6 @@
 /* $Id: dblog.css,v 1.5 2008/09/02 16:56:33 dries Exp $ */
 
-#edit-type-wrapper, #edit-severity-wrapper {
+.form-item-type-wrapper, .form-item-severity-wrapper {
   float: left; /* LTR */
   padding-right: .8em; /* LTR */
   margin: 0.1em;
Index: modules/book/book.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.css,v
retrieving revision 1.9
diff -u -r1.9 book.css
--- modules/book/book.css	11 Apr 2009 22:19:44 -0000	1.9
+++ modules/book/book.css	15 Jun 2009 23:29:03 -0000
@@ -38,7 +38,7 @@
 html.js #edit-book-pick-book {
   display: none;
 }
-#edit-book-bid-wrapper .description {
+.form-item-book-bid-wrapper .description {
   clear: both;
 }
 #book-admin-edit select {
Index: modules/locale/locale.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.css,v
retrieving revision 1.2
diff -u -r1.2 locale.css
--- modules/locale/locale.css	5 Feb 2009 00:32:46 -0000	1.2
+++ modules/locale/locale.css	15 Jun 2009 23:29:03 -0000
@@ -5,7 +5,7 @@
   text-decoration: line-through;
 }
 
-#edit-language-wrapper, #edit-translation-wrapper, #edit-group-wrapper {
+.form-item-language-wrapper, .form-item-translation-wrapper, .form-item-group-wrapper {
   float: left; /* LTR */
   padding-right: .8em; /* LTR */
   margin: 0.1em;
Index: modules/node/content_types.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.js,v
retrieving revision 1.4
diff -u -r1.4 content_types.js
--- modules/node/content_types.js	27 Apr 2009 20:19:37 -0000	1.4
+++ modules/node/content_types.js	15 Jun 2009 23:29:03 -0000
@@ -4,13 +4,13 @@
 Drupal.behaviors.contentTypes = {
   attach: function () {
     if ($('#edit-type').val() == $('#edit-name').val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_') || $('#edit-type').val() == '') {
-      $('#edit-type-wrapper').hide();
+      $('.form-item-type-wrapper').hide();
       $('#edit-name').keyup(function () {
         var machine = $(this).val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_');
         if (machine != '_' && machine != '') {
           $('#edit-type').val(machine);
           $('#node-type-name-suffix').empty().append(' Machine name: ' + machine + ' [').append($('<a href="#">' + Drupal.t('Edit') + '</a>').click(function () {
-            $('#edit-type-wrapper').show();
+            $('.form-item-type-wrapper').show();
             $('#node-type-name-suffix').hide();
             $('#edit-name').unbind('keyup');
             return false;
Index: modules/openid/openid.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.css,v
retrieving revision 1.6
diff -u -r1.6 openid.css
--- modules/openid/openid.css	31 Mar 2009 10:48:06 -0000	1.6
+++ modules/openid/openid.css	15 Jun 2009 23:29:03 -0000
@@ -6,11 +6,11 @@
   background-repeat: no-repeat;
   padding-left: 20px;
 }
-div#edit-openid-identifier-wrapper {
+div.form-item-openid-identifier-wrapper {
   display: block;
 }
-html.js #user-login-form div#edit-openid-identifier-wrapper,
-html.js #user-login div#edit-openid-identifier-wrapper {
+html.js #user-login-form div.form-item-openid-identifier-wrapper,
+html.js #user-login div.form-item-openid-identifier-wrapper {
   display: none;
 }
 html.js #user-login-form li.openid-link,
Index: modules/openid/openid.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.js,v
retrieving revision 1.10
diff -u -r1.10 openid.js
--- modules/openid/openid.js	27 Apr 2009 20:19:37 -0000	1.10
+++ modules/openid/openid.js	15 Jun 2009 23:29:03 -0000
@@ -3,8 +3,8 @@
 
 Drupal.behaviors.openid = {
   attach: function (context) {
-    var loginElements = $('#edit-name-wrapper, #edit-pass-wrapper, li.openid-link');
-    var openidElements = $('#edit-openid-identifier-wrapper, li.user-link');
+    var loginElements = $('.form-item-name-wrapper, .form-item-pass-wrapper, li.openid-link');
+    var openidElements = $('.form-item-openid-identifier-wrapper, li.user-link');
 
     // This behavior attaches by ID, so is only valid once on a page.
     if (!$('#edit-openid-identifier.openid-processed').size() && $('#edit-openid-identifier').val()) {
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.341
diff -u -r1.341 form.inc
--- includes/form.inc	15 Jun 2009 09:51:49 -0000	1.341
+++ includes/form.inc	15 Jun 2009 23:29:03 -0000
@@ -2608,11 +2608,7 @@
     $class[] = strtr($element['#name'], array('_' => '-', '[' => '-', ']' => '')) . '-wrapper';
   }
 
-  $output = '<div class="' . implode(' ', $class) . '"';
-  if (!empty($element['#id'])) {
-    $output .= ' id="' . $element['#id'] . '-wrapper"';
-  }
-  $output .= ">\n";
+  $output = '<div class="' . implode(' ', $class) . '">' . "\n";
   $required = !empty($element['#required']) ? '<span class="form-required" title="' . $t('This field is required.') . '">*</span>' : '';
 
   if (!empty($element['#title']) && empty($element['#form_element_skip_title'])) {