Index: filefield_field.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/filefield/filefield_field.inc,v
retrieving revision 1.35
diff -u -r1.35 filefield_field.inc
--- filefield_field.inc	24 Apr 2010 01:48:19 -0000	1.35
+++ filefield_field.inc	24 Apr 2010 21:06:47 -0000
@@ -142,9 +142,14 @@
       while (!empty($item['data']) && is_string($item['data'])) {
         $item['data'] = unserialize($item['data']);
       }
+      // Merge any data added by modules in hook_file_load().
+      if (isset($file['data']) && isset($item['data'])) {
+        $file['data'] = array_merge((array) $item['data'], (array) $file['data']);
+      }
       $items[$delta] = array_merge($item, $file);
     }
   }
+
   return array($field['field_name'] => $items);
 }