Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.415.2.4
diff -u -p -r1.415.2.4 theme.inc
--- includes/theme.inc	14 May 2008 14:19:40 -0000	1.415.2.4
+++ includes/theme.inc	14 May 2008 18:32:58 -0000
@@ -349,6 +349,9 @@ function _theme_process_registry(&$cache
       elseif (isset($cache[$hook]['preprocess functions']) && is_array($cache[$hook]['preprocess functions'])) {
         $info['preprocess functions'] = array_merge($cache[$hook]['preprocess functions'], $info['preprocess functions']);
       }
+      elseif (isset($info['original hook']) && isset($cache[$info['original hook']]['preprocess functions']) && is_array($cache[$info['original hook']]['preprocess functions'])) {
+        $info['preprocess functions'] = array_merge($cache[$info['original hook']]['preprocess functions'], $info['preprocess functions']);
+      }
       $result[$hook]['preprocess functions'] = $info['preprocess functions'];
     }
 
@@ -731,7 +734,6 @@ function drupal_find_theme_functions($ca
               'function' => $match,
               'arguments' => $info['arguments'],
               'original hook' => $hook,
-              'preprocess functions' => $info['preprocess functions'],
             );
           }
         }
@@ -825,7 +827,6 @@ function drupal_find_theme_templates($ca
             'path' => dirname($files[$match]->filename),
             'arguments' => $info['arguments'],
             'original hook' => $hook,
-            'preprocess functions' => $info['preprocess functions'],
           );
         }
       }