Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.577
diff -u -p -r1.577 taxonomy.module
--- modules/taxonomy/taxonomy.module	11 Feb 2010 17:44:47 -0000	1.577
+++ modules/taxonomy/taxonomy.module	3 Mar 2010 02:51:25 -0000
@@ -1094,7 +1094,14 @@ function taxonomy_field_widget_info_alte
  * Implements hook_options_list().
  */
 function taxonomy_options_list($field) {
-  return taxonomy_allowed_values($field);
+  if (isset($field['settings']['options_list_callback'])) {
+    $function = $field['settings']['options_list_callback'];
+    $options = $function($field);
+  }
+  else {
+    $options = taxonomy_allowed_values($field);
+  }
+  return $options;
 }
 
 /**