Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.41
diff -u -p -r1.41 block.admin.inc
--- modules/block/block.admin.inc	29 May 2009 21:28:58 -0000	1.41
+++ modules/block/block.admin.inc	2 Jun 2009 20:55:37 -0000
@@ -126,6 +126,7 @@ function block_admin_display_form_submit
  */
 function _block_compare($a, $b) {
   global $theme_key;
+  // $regions does not use drupal_static as its value never resets.
   static $regions;
 
   // We need the region list to correctly order by region.
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.341
diff -u -p -r1.341 block.module
--- modules/block/block.module	31 May 2009 07:46:54 -0000	1.341
+++ modules/block/block.module	2 Jun 2009 20:55:37 -0000
@@ -559,9 +559,10 @@ function block_initialize_theme_blocks($
  *   array key instead of <i>module</i>_<i>delta</i>.
  */
 function block_list($region) {
+  // $blocks does not use drupal_static as its value never resets.
   static $blocks = array();
 
-  if (!count($blocks)) {
+  if (empty($blocks)) {
     $blocks = _block_load_blocks();
   }
 
@@ -776,6 +777,7 @@ function block_flush_caches() {
  * @see block.tpl.php
  */
 function template_preprocess_block(&$variables) {
+  // $block_counter does not use drupal_static as its value never resets.
   static $block_counter = array();
   $variables['block'] = $variables['block']['#block'];
   // All blocks get an independent counter for each region.