Index: filefield_field.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/filefield/filefield_field.inc,v
retrieving revision 1.40
diff -u -r1.40 filefield_field.inc
--- filefield_field.inc	29 Jun 2010 21:44:07 -0000	1.40
+++ filefield_field.inc	30 Jun 2010 19:09:32 -0000
@@ -289,9 +289,9 @@
     if (!empty($item['fid']) && empty($item['filepath'])) {
       $file = (array) field_file_load($item['fid']);
       if (isset($file['data'])) {
-        $items[$delta]['data'] = array_merge($item['data'], $file['data']);
+        $file['data'] = array_merge($items[$delta]['data'], $file['data']);
       }
-      $items[$delta] = array_merge($item, $file);
+      $items[$delta] = array_merge($items[$delta], $file);
     }
 
     // Verify the file exists on the server.