Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/template.php,v
retrieving revision 1.45.2.7
diff -u -p -r1.45.2.7 template.php
--- template.php	26 Jun 2010 19:18:23 -0000	1.45.2.7
+++ template.php	24 Jul 2010 02:11:25 -0000
@@ -228,9 +228,29 @@ function zen_blocks($region, $show_block
     $render_sidebars = $show_blocks;
   }
 
+  // Is the Context module enabled? If so make sure that the blocks Context wants to display get displayed 
+  if (module_exists("context")) {
+	$output = '';
+
+    // Get the Context plugin needed to get the blocks that needs to be displayed for this region 
+    $plugin = context_get_plugin('reaction', 'block');
+
+    // Let's get the blocks that should be displayed from Context.
+    if (is_object($plugin)) {
+      $output .= $plugin->execute($region);
+    }
+
+    // Add any other content assigned to this region through drupal_set_content() calls.
+    $output .= drupal_get_content($region);
+
+    $elements['#children'] = $output;
+    $elements['#region'] = $region;
+
+    return $output ? theme('region', $elements) : '';
+  }
   // If zen_blocks was called with a NULL region, its likely we were just
   // setting the $render_sidebars static variable.
-  if ($region) {
+  else if ($region) {
     $output = '';
 
     // If $renders_sidebars is FALSE, don't render any region whose name begins