=== modified file 'includes/theme.inc'
--- includes/theme.inc	2010-01-04 16:20:20 +0000
+++ includes/theme.inc	2010-01-05 14:44:22 +0000
@@ -2478,20 +2478,22 @@ function template_page_suggestions($args
   // page.tpl.php
 
   $suggestions = array();
+  $prefix = $suggestion;
   foreach ($args as $arg) {
     // Remove slashes or null per SA-CORE-2009-003.
     $arg = str_replace(array("/", "\\", "\0"), '', $arg);
     // The percent acts as a wildcard for numeric arguments since
     // asterisks are not valid filename characters on many filesystems.
     if (is_numeric($arg)) {
-      $suggestions[] = $suggestion . '-%';
+      $suggestions[] = $prefix . '-%';
     }
-    $suggestions[] = $suggestion . '-' . $arg;
+    $suggestions[] = $prefix . '-' . $arg;
     if (!is_numeric($arg)) {
-      $suggestion .= '-' . $arg;
+      $prefix .= '-' . $arg;
     }
   }
   if (drupal_is_front_page()) {
+    // Front templates should be based on root only, not prefixed arguments.
     $suggestions[] = $suggestion . '-front';
   }