### Eclipse Workspace Patch 1.0
#P Drupal7-head
Index: modules/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.73
diff -u -r1.73 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc	14 Oct 2010 18:50:27 -0000	1.73
+++ modules/field_ui/field_ui.admin.inc	17 Oct 2010 08:44:54 -0000
@@ -826,7 +826,7 @@
     '#extra' => array_keys($extra_fields),
   );
 
-  if (empty($instances)) {
+  if (empty($instances) && empty($extra_fields)) {
     drupal_set_message(t('There are no fields yet added. You can add new fields on the <a href="@link">Manage fields</a> page.', array('@link' => url($admin_path . '/fields'))), 'warning');
     return $form;
   }