Index: content.node_form.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/includes/Attic/content.node_form.inc,v
retrieving revision 1.7.2.19
diff -u -r1.7.2.19 content.node_form.inc
--- content.node_form.inc	2 Jun 2009 20:18:27 -0000	1.7.2.19
+++ content.node_form.inc	12 Jun 2009 21:14:32 -0000
@@ -155,9 +155,17 @@
       break;
     case 1:
       $filled_items = content_set_empty($field, $items);
+        // make the count different for no item (filled with an empty item by content_set_empty) and 1 item with data
+       $hook_is_empty = $field['module'] .'_content_is_empty';
+       if (count($items) == 1 && $hook_is_empty($items[0], $field)) {
+         $minimum_item_count = 0;
+       }
+       else {
+         $minimum_item_count = count($items)-1;
+       }
       $current_item_count = isset($form_state['item_count'][$field_name])
                             ? $form_state['item_count'][$field_name]
-                            : count($items);
+                             : $minimum_item_count;
       // We always want at least one empty icon for the user to fill in.
       $max = ($current_item_count > count($filled_items))
               ? $current_item_count - 1