Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.473
diff -u -p -r1.473 taxonomy.module
--- modules/taxonomy/taxonomy.module	19 May 2009 19:01:51 -0000	1.473
+++ modules/taxonomy/taxonomy.module	22 May 2009 18:34:24 -0000
@@ -1271,6 +1271,10 @@ function taxonomy_vocabulary_load_multip
  *   Results are statically cached.
  */
 function taxonomy_vocabulary_load($vid) {
+  $vocabularies = drupal_static('taxonomy_vocabulary_load_multiple');
+  if (isset($vocabularies[$vid])) {
+    return $vocabularies[$vid];
+  }
   return reset(taxonomy_vocabulary_load_multiple(array($vid), array()));
 }