Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.84
diff -u -p -F '^f' -r1.84 field.module
--- modules/field/field.module	5 Sep 2010 02:21:38 -0000	1.84
+++ modules/field/field.module	9 Oct 2010 06:15:20 -0000
@@ -854,6 +854,7 @@ function template_preprocess_field(&$var
 
   // Add specific suggestions that can override the default implementation.
   $variables['theme_hook_suggestions'] = array(
+    'field__' . $element['#field_type'],
     'field__' . $element['#field_name'],
     'field__' . $element['#bundle'],
     'field__' . $element['#field_name'] . '__' . $element['#bundle'],