Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.327
diff -u -r1.327 form.inc
--- includes/form.inc	11 Apr 2009 22:19:44 -0000	1.327
+++ includes/form.inc	26 Apr 2009 08:56:54 -0000
@@ -2628,7 +2628,14 @@
   // This is also used in the installer, pre-database setup.
   $t = get_t();
 
-  $output = '<div class="form-item"';
+  $class = array('form-item');
+  // add element type to class.
+  $class[] = 'form-'. form_clean_id($element['#type']);
+  // add classes of element to surrounding div.
+  if (isset($element['#attributes']['class'])) {
+  	$class = array_merge($class, $element['#attributes']['class']);
+  }
+  $output = '<div class="'. implode(' ', $class) .'"';
   if (!empty($element['#id'])) {
     $output .= ' id="' . $element['#id'] . '-wrapper"';
   }