Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.470
diff -u -p -r1.470 theme.inc
--- includes/theme.inc	22 Feb 2009 17:55:29 -0000	1.470
+++ includes/theme.inc	25 Feb 2009 04:14:12 -0000
@@ -1830,6 +1830,11 @@ function template_preprocess_page(&$vari
     $variables[$region_key] = empty($variables['page'][$region_key]) ? '' : drupal_render($variables['page'][$region_key]);
   }
 
+  // Render the content variable.
+  if (!isset($variables['content'])) {
+    $variables['content'] = empty($variables['page']['content']) ? '' : drupal_render($variables['page']['content']);
+  }
+
   // Add favicon.
   if (theme_get_setting('toggle_favicon')) {
     drupal_set_html_head('<link rel="shortcut icon" href="' . check_url(theme_get_setting('favicon')) . '" type="image/x-icon" />');
Index: modules/block/block.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.test,v
retrieving revision 1.11
diff -u -p -r1.11 block.test
--- modules/block/block.test	11 Feb 2009 03:38:46 -0000	1.11
+++ modules/block/block.test	25 Feb 2009 04:14:12 -0000
@@ -23,7 +23,8 @@ class BlockTestCase extends DrupalWebTes
     $this->regions = array();
     $this->regions[] = array('name' => 'header', 'id' => 'header-region');
     $this->regions[] = array('name' => 'left', 'id' => 'sidebar-left');
-    $this->regions[] = array('name' => 'content', 'id' => 'center');
+    $this->regions[] = array('name' => 'content_top', 'id' => 'center');
+    $this->regions[] = array('name' => 'content_bottom', 'id' => 'center');
     $this->regions[] = array('name' => 'right', 'id' => 'sidebar-right');
     $this->regions[] = array('name' => 'footer');
   }
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.17
diff -u -p -r1.17 page.tpl.php
--- modules/system/page.tpl.php	24 Feb 2009 17:50:22 -0000	1.17
+++ modules/system/page.tpl.php	25 Feb 2009 04:14:13 -0000
@@ -56,7 +56,9 @@
  * - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the view
  *   and edit tabs when displaying a node).
  * - $help: Dynamic help text, mostly for admin pages.
+ * - $content_top: The region just before the main content of the page.
  * - $content: The main content of the current Drupal page.
+ * - $content_bottom: The region just after the main content of the page.
  * - $feed_icons: A string of all feed icons for the current page.
  * - $left: The HTML for the left sidebar.
  * - $right: The HTML for the right sidebar.
@@ -140,9 +142,11 @@
         <?php print $messages; ?>
         <?php if ($tabs): ?><div class="tabs"><?php print $tabs; ?></div><?php endif; ?>
         <?php print $help; ?>
-        <div id="content-area" class="region">
+        <?php if ($content_top): ?><div id="content-top" class="region"><?php print $content_top; ?></div><?php endif; ?>
+        <div id="content-area">
           <?php print $content; ?>
         </div> <!-- /#content-area -->
+        <?php if ($content_bottom): ?><div id="content-bottom" class="region"><?php print $content_bottom; ?></div><?php endif; ?>
         <?php print $feed_icons; ?>
       </div></div> <!-- /.section, /#content -->
 
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.668
diff -u -p -r1.668 system.module
--- modules/system/system.module	22 Feb 2009 17:55:30 -0000	1.668
+++ modules/system/system.module	25 Feb 2009 04:14:13 -0000
@@ -1084,7 +1084,8 @@ function system_theme_default() {
     'regions' => array(
       'left' => 'Left sidebar',
       'right' => 'Right sidebar',
-      'content' => 'Content',
+      'content_top' => 'Content top',
+      'content_bottom' => 'Content bottom',
       'header' => 'Header',
       'footer' => 'Footer',
     ),
Index: themes/bluemarine/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/page.tpl.php,v
retrieving revision 1.33
diff -u -p -r1.33 page.tpl.php
--- themes/bluemarine/page.tpl.php	18 Feb 2009 14:28:24 -0000	1.33
+++ themes/bluemarine/page.tpl.php	25 Feb 2009 04:14:14 -0000
@@ -37,7 +37,9 @@
         <?php if ($tabs) { ?><div class="tabs"><?php print $tabs ?></div><?php } ?>
         <?php print $help ?>
         <?php if ($show_messages) { print $messages; } ?>
+        <?php print $content_top; ?>
         <?php print $content; ?>
+        <?php print $content_bottom; ?>
         <?php print $feed_icons; ?>
       </div>
     </div>
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.24
diff -u -p -r1.24 page.tpl.php
--- themes/garland/page.tpl.php	18 Feb 2009 14:28:25 -0000	1.24
+++ themes/garland/page.tpl.php	25 Feb 2009 04:14:14 -0000
@@ -53,7 +53,9 @@
           <?php if ($show_messages && $messages): print $messages; endif; ?>
           <?php print $help; ?>
           <div class="clearfix">
+            <?php print $content_top ?>
             <?php print $content ?>
+            <?php print $content_bottom ?>
           </div>
           <?php print $feed_icons ?>
           <div id="footer"><?php print $footer_message . $footer ?></div>
Index: themes/pushbutton/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/page.tpl.php,v
retrieving revision 1.29
diff -u -p -r1.29 page.tpl.php
--- themes/pushbutton/page.tpl.php	24 Nov 2008 15:27:13 -0000	1.29
+++ themes/pushbutton/page.tpl.php	25 Feb 2009 04:14:14 -0000
@@ -84,7 +84,9 @@
         <?php endif; ?>
 
       <!-- start main content -->
+      <?php print $content_top; ?>
       <?php print $content; ?>
+      <?php print $content_bottom; ?>
       <?php print $feed_icons; ?>
       <!-- end main content -->