diff --git .htaccess .htaccess
index 9c4a161..e90b0ad 100644
--- .htaccess
+++ .htaccess
@@ -61,6 +61,8 @@ DirectoryIndex index.php index.html index.htm
   </FilesMatch>
 </IfModule>
 
+php_value memory_limit 392M
+
 # Various rewrite rules.
 <IfModule mod_rewrite.c>
   RewriteEngine on
@@ -104,7 +106,7 @@ DirectoryIndex index.php index.html index.htm
   #
   # If your site is running in a VirtualDocumentRoot at http://example.com/,
   # uncomment the following line:
-  # RewriteBase /
+  RewriteBase /
 
   # Pass all requests not referring directly to files in the filesystem to
   # index.php. Clean URLs are handled in drupal_environment_initialize().
@@ -139,4 +141,4 @@ DirectoryIndex index.php index.html index.htm
   </IfModule>
 </IfModule>
 
-# $Id$
+# $Id: .htaccess,v 1.111 2010/11/23 02:59:05 dries Exp $
diff --git includes/theme.inc includes/theme.inc
index 806e5ee..c1859b2 100644
--- includes/theme.inc
+++ includes/theme.inc
@@ -2265,6 +2265,11 @@ function template_preprocess_page(&$variables) {
   $variables['site_slogan']       = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : '');
   $variables['tabs']              = menu_local_tabs();
 
+  // Find the title of the menu used by the secondary links.
+  $secondary_links = variable_get('menu_secondary_links_source', 'user-menu');
+  $menus = menu_get_menus();
+  $variables['secondary_menu_heading'] = $menus[$secondary_links];
+
   if ($node = menu_get_object()) {
     $variables['node'] = $node;
   }
diff --git modules/system/page.tpl.php modules/system/page.tpl.php
index 8ffe82a..3385fef 100644
--- modules/system/page.tpl.php
+++ modules/system/page.tpl.php
@@ -30,6 +30,7 @@
  *   site, if they have been configured.
  * - $secondary_menu (array): An array containing the Secondary menu links for
  *   the site, if they have been configured.
+ * - $secondary_menu_heading: The title of the menu used by the secondary links.
  * - $breadcrumb: The breadcrumb trail for the current page.
  *
  * Page content (in order of occurrence in the default page.tpl.php):
@@ -104,7 +105,7 @@
     <?php if ($main_menu || $secondary_menu): ?>
       <div id="navigation"><div class="section">
         <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Main menu'))); ?>
-        <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
+        <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => $secondary_menu_heading)); ?>
       </div></div> <!-- /.section, /#navigation -->
     <?php endif; ?>
 
diff --git themes/bartik/templates/page.tpl.php themes/bartik/templates/page.tpl.php
index 7b0f990..75bb8be 100644
--- themes/bartik/templates/page.tpl.php
+++ themes/bartik/templates/page.tpl.php
@@ -40,6 +40,7 @@
  *   site, if they have been configured.
  * - $secondary_menu (array): An array containing the Secondary menu links for
  *   the site, if they have been configured.
+ * - $secondary_menu_heading: The title of the menu used by the secondary links.
  * - $breadcrumb: The breadcrumb trail for the current page.
  *
  * Page content (in order of occurrence in the default page.tpl.php):
@@ -148,7 +149,7 @@
             'class' => array('links', 'inline', 'clearfix'),
           ),
           'heading' => array(
-            'text' => t('Secondary menu'),
+            'text' => $secondary_menu_heading,
             'level' => 'h2',
             'class' => array('element-invisible'),
           ),
diff --git themes/garland/template.php themes/garland/template.php
index 1b144f1..fa193fc 100644
--- themes/garland/template.php
+++ themes/garland/template.php
@@ -88,7 +88,7 @@ function garland_preprocess_page(&$vars) {
         'class' => array('links', 'inline', 'secondary-menu'),
       ),
       'heading' => array(
-        'text' => t('Secondary menu'),
+        'text' => $vars['secondary_menu_heading'],
         'level' => 'h2',
         'class' => array('element-invisible'),
       )