Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.445
diff -u -p -r1.445 form.inc
--- includes/form.inc	26 Mar 2010 18:58:12 -0000	1.445
+++ includes/form.inc	31 Mar 2010 00:50:06 -0000
@@ -3123,7 +3126,17 @@ function theme_form_element_label($varia
   }
 
   // The leading whitespace helps visually separate fields from inline labels.
-  return ' <label' . drupal_attributes($attributes) . '>' . $t('!title !required', array('!title' => $title, '!required' => $required)) . "</label>\n";
+  $label = ' <label' . drupal_attributes($attributes) . '>' . $t('!title !required', array('!title' => $title, '!required' => $required)) . '</label>';
+  // Wrap the element in a span tag to accomodate inline elements.
+  return theme('html_tag', array(
+    'element' => array(
+      '#attributes' => array(
+        'class' => array('label-wrapper', $attributes['for'] . '-label-wrapper'),
+      ),
+      '#value' => $label,
+      '#tag' => 'span',
+    ),
+  ));
 }
 
 /**