Index: filefield_field.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/filefield/filefield_field.inc,v
retrieving revision 1.41
diff -u -r1.41 filefield_field.inc
--- filefield_field.inc	30 Jun 2010 23:52:45 -0000	1.41
+++ filefield_field.inc	6 Jul 2010 23:09:45 -0000
@@ -144,9 +144,9 @@
       }
       // 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']);
+        $file['data'] = array_merge((array) $file['data'], (array) $item['data']);
       }
-      $items[$delta] = array_merge($item, $file);
+      $items[$delta] = array_merge($file, $item);
     }
   }
 
@@ -289,9 +289,9 @@
     if (!empty($item['fid']) && empty($item['filepath'])) {
       $file = (array) field_file_load($item['fid']);
       if (isset($file['data'])) {
-        $file['data'] = array_merge($items[$delta]['data'], $file['data']);
+        $file['data'] = array_merge($file['data'], $items[$delta]['data']);
       }
-      $items[$delta] = array_merge($items[$delta], $file);
+      $items[$delta] = array_merge($file, $items[$delta]);
     }
 
     // Verify the file exists on the server.