Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.352
diff -u -p -r1.352 theme.inc
--- includes/theme.inc	27 Apr 2007 07:42:54 -0000	1.352
+++ includes/theme.inc	27 Apr 2007 16:42:40 -0000
@@ -291,7 +291,7 @@ function list_theme_engines($refresh = F
  * the $variables array:
  *
  * ENGINE_engine_preprocess(&$variables)
- *   This function should only be implemented by theme engines and is exists
+ *   This function should only be implemented by theme engines and exists
  *   so that the theme engine can set necessary variables. It is commonly
  *   used to set global variables such as $directory and $is_front_page.
  * ENGINE_engine_preprocess_HOOK(&$variables)
@@ -349,7 +349,11 @@ function theme() {
     // The theme call is a function.
     // Include a file if this theme function is held elsewhere.
     if (!empty($info['file'])) {
-      include_once($info['file']);
+      $function_file = $info['file'];
+      if (isset($info['path'])) {
+        $function_file = $info['path'] .'/'. $function_file;
+      }
+      include_once($function_file);
     }
     return call_user_func_array($info['function'], $args);
   }