Index: modules/field/field.info.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.info.inc,v
retrieving revision 1.24
diff -u -r1.24 field.info.inc
--- modules/field/field.info.inc	16 Oct 2009 02:47:16 -0000	1.24
+++ modules/field/field.info.inc	25 Oct 2009 00:03:57 -0000
@@ -191,7 +191,7 @@
  *     both deleted and non-deleted fields. The bundles element is the same as
  *     for 'fields'.
  *   - instances: Array of existing instances, keyed by object type, bundle
- *     name and field name. This entry only lists non-deleted instances. 
+ *     name and field name. This entry only lists non-deleted instances.
  */
 function _field_info_collate_fields($reset = FALSE) {
   static $info;
@@ -230,8 +230,10 @@
 
     // Populate 'instances'. Only non-deleted instances are considered.
     $info['instances'] = array();
-    foreach (field_info_bundles() as $bundle => $bundle_info) {
-      $info['instances'][$bundle] = array();
+    foreach (field_info_bundles() as $obj_type => $bundles) {
+      foreach ($bundles as $bundle => $bundle_info) {
+        $info['instances'][$obj_type][$bundle] = array();
+      }
     }
     foreach ($definitions['instances'] as $instance) {
       $field = $info['fields'][$instance['field_name']];