--- ../cvs/features-DRUPAL-7--1/includes/features.field.inc	2010-05-07 19:11:11.000000000 +0200
+++ /drupal/sites/all/modules/features/includes/features.field.inc	2010-08-18 16:17:57.000000000 +0200
@@ -25,7 +25,7 @@ function field_features_export($data, &$
   foreach ($modules as $module) {
     $fields = module_invoke($module, 'field_default_fields');
     foreach ($fields as $name => $field) {
-      $map["{$field['bundle']}-{$field['field_name']}"] = $module;
+      $map["{$field['bundles']}-{$field['field_name']}"] = $module;
     }
   }
 
@@ -126,14 +126,26 @@ function field_features_rebuild($module)
       else {
         field_create_field($field);
       }
-
-      $existing_instance = field_info_instance($field['entity_type'], $field['type_name'], $field['bundle']);
-      if ($existing_instance) {
-        field_update_instance($field);
-      }
-      else {
-        field_create_instance($field);
+   
+      // update/create field instances
+      if(!empty($field['bundles'])) {
+        foreach($field['bundles'] as $entity_type => $bundles) {
+          if(is_array($bundles)) {
+            foreach($bundles as $bundle) {
+              $instance = field_info_instance($entity_type, $field['field_name'], $bundle);
+              if ($instance) {
+                field_update_instance($instance);
+              } else {
+                $field['entity_type'] = $entity_type;
+                $field['bundle'] = $bundle;
+                field_create_instance($field);
+              }            
+            }
+          }
+           
+        }
       }
+
       variable_set('menu_rebuild_needed', TRUE);
     }
   }