Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.45
diff -u -r1.45 field.module
--- modules/field/field.module	26 Oct 2009 00:15:41 -0000	1.45
+++ modules/field/field.module	30 Oct 2009 00:57:34 -0000
@@ -696,7 +696,7 @@
  */
 function field_extract_bundle($obj_type, $bundle) {
   if (is_string($bundle)) {
-    return $bundle;
+    return strtr($bundle, array('-' => '_'));
   }
 
   $info = field_info_fieldable_types($obj_type);
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.357
diff -u -r1.357 menu.inc
--- includes/menu.inc	17 Oct 2009 11:39:15 -0000	1.357
+++ includes/menu.inc	30 Oct 2009 00:57:33 -0000
@@ -422,7 +422,7 @@
 
 /**
  * Execute the page callback associated with the current path.
- * 
+ *
  * @param $path
  *   The drupal path whose handler is to be be executed. If set to NULL, then
  *   the current path is used.
@@ -519,7 +519,7 @@
               $args[$i] = &$map;
             }
             if (is_int($arg)) {
-              $args[$i] = isset($path_map[$arg]) ? $path_map[$arg] : '';
+              $args[$i] = isset($map[$arg]) ? $map[$arg] : '';
             }
           }
           array_unshift($args, $value);
Index: modules/field_ui/field_ui.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.module,v
retrieving revision 1.13
diff -u -r1.13 field_ui.module
--- modules/field_ui/field_ui.module	29 Oct 2009 07:23:38 -0000	1.13
+++ modules/field_ui/field_ui.module	30 Oct 2009 00:57:34 -0000
@@ -134,9 +134,9 @@
 /**
  * Menu loader; Load a field instance based on its name.
  */
-function field_ui_menu_load($field_name, $obj_type, $bundle_name) {
-  $bundle_name = strtr($bundle_name, array('-' => '_'));
-  if ($instance = field_info_instance($obj_type, $field_name, $bundle_name)) {
+function field_ui_menu_load($field_name, $obj_type, $bundle) {
+  $bundle = field_extract_bundle($obj_type, $bundle);
+  if ($instance = field_info_instance($obj_type, $field_name, $bundle)) {
     return $instance;
   }
   return FALSE;