Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.311
diff -u -r1.311 menu.inc
--- includes/menu.inc	5 Feb 2009 01:05:17 -0000	1.311
+++ includes/menu.inc	7 Feb 2009 04:55:26 -0000
@@ -1807,19 +1807,19 @@
     else {
       // We need to manually call each module so that we can know which module
       // a given item came from.
-      $callbacks = array();
+      $items = array();
       foreach (module_implements('menu', TRUE) as $module) {
         $router_items = call_user_func($module . '_menu');
         if (isset($router_items) && is_array($router_items)) {
           foreach (array_keys($router_items) as $path) {
             $router_items[$path]['module'] = $module;
           }
-          $callbacks = array_merge($callbacks, $router_items);
+          $items = array_merge($items, $router_items);
         }
       }
       // Alter the menu as defined in modules, keys are like user/%user.
-      drupal_alter('menu', $callbacks);
-      $menu = _menu_router_build($callbacks);
+      drupal_alter('menu', $items);
+      $menu = _menu_router_build($items);
     }
   }
   return $menu;
@@ -2407,11 +2407,11 @@
 /**
  * Helper function to build the router table based on the data from hook_menu.
  */
-function _menu_router_build($callbacks) {
+function _menu_router_build($items) {
   // First pass: separate callbacks from paths, making paths ready for
   // matching. Calculate fitness, and fill some default values.
   $menu = array();
-  foreach ($callbacks as $path => $item) {
+  foreach ($items as $path => $item) {
     $load_functions = array();
     $to_arg_functions = array();
     $fit = 0;