Index: .htaccess
===================================================================
RCS file: /cvs/drupal/drupal/.htaccess,v
retrieving revision 1.111
diff -u -p -r1.111 .htaccess
--- .htaccess	23 Nov 2010 02:59:05 -0000	1.111
+++ .htaccess	4 Jan 2011 06:18:20 -0000
@@ -2,6 +2,10 @@
 # Apache/PHP/Drupal settings:
 #
 
+php_value auto_prepend_file /usr/share/php/xhprof_includes/header.php
+php_value auto_append_file /usr/share/php/xhprof_includes/footer.php
+
+
 # Protect files and directories from prying eyes.
 <FilesMatch "\.(engine|inc|info|install|make|module|profile|test|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)$|^(\..*|Entries.*|Repository|Root|Tag|Template)$">
   Order allow,deny
Index: includes/install.core.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.core.inc,v
retrieving revision 1.49
diff -u -p -r1.49 install.core.inc
--- includes/install.core.inc	3 Jan 2011 15:48:11 -0000	1.49
+++ includes/install.core.inc	4 Jan 2011 06:18:20 -0000
@@ -1065,7 +1065,7 @@ function install_select_profile_form($fo
     // TODO: is this right?
     include_once DRUPAL_ROOT . '/' . $profile->uri;
 
-    $details = install_profile_info($profile->name);
+    $details = install_profile_info($profile->name, 'en', FALSE);
     // Don't show hidden profiles. This is used by to hide the testing profile,
     // which only exists to speed up test runs.
     if ($details['hidden'] === TRUE) {
Index: includes/install.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.inc,v
retrieving revision 1.152
diff -u -p -r1.152 install.inc
--- includes/install.inc	2 Jan 2011 17:23:20 -0000	1.152
+++ includes/install.inc	4 Jan 2011 06:18:20 -0000
@@ -199,7 +199,7 @@ function drupal_install_profile_distribu
   // At all other times, we load the profile via standard methods.
   else {
     $profile = drupal_get_profile();
-    $info = install_profile_info($profile);
+    $info = install_profile_info($profile, 'en', FALSE);
     return $info['distribution_name'];
   }
 }
@@ -1211,13 +1211,16 @@ function drupal_check_module($module) {
  *   Name of profile.
  * @param locale
  *   Name of locale used (if any).
+ * @dependencies
+ *   Whether to additionally load information about the profile's dependencies
+ *   defaults to TRUE.
  * @return
  *   The info array.
  */
-function install_profile_info($profile, $locale = 'en') {
+function install_profile_info($profile, $locale = 'en', $dependencies = TRUE) {
   $cache = &drupal_static(__FUNCTION__, array());
 
-  if (!isset($cache[$profile])) {
+  if (!isset($cache[$locale][$dependencies][$profile])) {
     // Set defaults for module info.
     $defaults = array(
       'dependencies' => array(),
@@ -1228,19 +1231,21 @@ function install_profile_info($profile, 
       'php' => DRUPAL_MINIMUM_PHP,
     );
     $info = drupal_parse_info_file("profiles/$profile/$profile.info") + $defaults;
-    $info['dependencies'] = array_unique(array_merge(
-      drupal_required_modules(),
-      $info['dependencies'],
-      ($locale != 'en' && !empty($locale) ? array('locale') : array()))
-    );
+    if ($dependencies) {
+      $info['dependencies'] = array_unique(array_merge(
+        drupal_required_modules(),
+        $info['dependencies'],
+        ($locale != 'en' && !empty($locale) ? array('locale') : array()))
+      );
 
-    // drupal_required_modules() includes the current profile as a dependency.
-    // Since a module can't depend on itself we remove that element of the array.
-    array_shift($info['dependencies']);
+      // drupal_required_modules() includes the current profile as a dependency.
+      // Since a module can't depend on itself we remove that element of the array.
+      array_shift($info['dependencies']);
+    }
 
-    $cache[$profile] = $info;
+    $cache[$locale][$dependencies][$profile] = $info;
   }
-  return $cache[$profile];
+  return $cache[$locale][$dependencies][$profile];
 }
 
 /**
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.532
diff -u -p -r1.532 system.install
--- modules/system/system.install	2 Jan 2011 17:26:39 -0000	1.532
+++ modules/system/system.install	4 Jan 2011 06:18:20 -0000
@@ -33,7 +33,7 @@ function system_requirements($phase) {
     // is not running the default install profile.
     $profile = drupal_get_profile();
     if ($profile != 'standard') {
-      $info = install_profile_info($profile);
+      $info = install_profile_info($profile, 'en', FALSE);
       $requirements['install_profile'] = array(
         'title' => $t('Install profile'),
         'value' => $t('%profile_name (%profile-%version)', array(