Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.80
diff -u -p -r1.80 bootstrap.inc
--- includes/bootstrap.inc	5 Jan 2006 10:51:47 -0000	1.80
+++ includes/bootstrap.inc	16 Jan 2006 08:37:08 -0000
@@ -164,14 +164,16 @@ function drupal_get_filename($type, $nam
     $files[$type][$name] = $file;
   }
   else {
-    $config = conf_init();
+    $config = array('sites/all', conf_init());
     $dir = (($type == 'theme_engine') ? 'themes/engines' : "${type}s");
     $file = (($type == 'theme_engine') ? "$name.engine" : "$name.$type");
 
-    foreach (array("$config/$dir/$file", "$config/$dir/$name/$file", "$dir/$file", "$dir/$name/$file") as $file) {
-      if (file_exists($file)) {
-        $files[$type][$name] = $file;
-        break;
+    foreach ($config as $conf) {
+      foreach (array("$conf/$dir/$file", "$conf/$dir/$name/$file", "$dir/$file", "$dir/$name/$file") as $file) {
+        if (file_exists($file)) {
+          $files[$type][$name] = $file;
+          break;
+        }
       }
     }
   }
Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.278
diff -u -p -r1.278 system.module
--- modules/system.module	12 Jan 2006 19:29:36 -0000	1.278
+++ modules/system.module	16 Jan 2006 08:37:09 -0000
@@ -679,12 +679,14 @@ function system_default_region($theme) {
  *   An array of file objects of the specified type.
  */
 function system_listing($mask, $directory, $key = 'name', $min_depth = 1) {
-  $config = conf_init();
+  $config = array('sites/all', conf_init());
   $searchdir = array($directory);
   $files = array();
 
-  if (file_exists("$config/$directory")) {
-    $searchdir[] = "$config/$directory";
+  foreach ($config as $conf) {
+    if (file_exists("$conf/$directory")) {
+      $searchdir[] = "$conf/$directory";
+    }
   }
 
   // Get current list of items