Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.84
diff -u -p -r1.84 field.module
--- modules/field/field.module  5 Sep 2010 02:21:38 -0000 1.84
+++ modules/field/field.module  8 Oct 2010 13:44:55 -0000
@@ -953,12 +953,22 @@ function theme_field($variables) {
   }

   // Render the items.
-  $output .= '<div class="field-items"' . $variables['content_attributes'] . '>';
+  $multiple_items = count($variables['items']) > 1;
+  if($multiple_items){
+    $output .= '<div class="field-items"' . $variables['content_attributes'] . '>';
+  }
   foreach ($variables['items'] as $delta => $item) {
-    $classes = 'field-item ' . ($delta % 2 ? 'odd' : 'even');
-    $output .= '<div class="' . $classes . '"' . $variables['item_attributes'][$delta] . '>' . drupal_render($item) . '</div>';
+    if($multiple_items){
+      $classes = 'field-item ' . ($delta % 2 ? 'odd' : 'even');
+      $output .= '<div class="' . $classes . '"' . $variables['item_attributes'][$delta] . '>' . drupal_render($item) . '</div>';
+    }
+   else {
+    $output .= drupal_render($item);
+    }
+  }
+  if($multiple_items){
+    $output .= '</div>';
   }
-  $output .= '</div>';

   // Render the top-level DIV.
   $output = '<div class="' . $variables['classes'] . '"' . $variables['attributes'] . '>' . $output . '</div>';