Index: block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.265
diff -u -r1.265 block.module
--- block.module	11 Jun 2007 07:46:05 -0000	1.265
+++ block.module	21 Jun 2007 14:57:30 -0000
@@ -100,7 +100,7 @@
   $default = variable_get('theme_default', 'garland');
   foreach (list_themes() as $key => $theme) {
     $items['admin/build/block/list/'. $key] = array(
-      'title' => '!key settings',
+      'title' => '!key',
       'title arguments' => array('!key' => $theme->info['name']),
       'page arguments' => array('block_admin_display', $key),
       'type' => $key == $default ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
@@ -217,7 +217,7 @@
 /**
  * Generate main block administration form.
  */
-function block_admin_display($theme = NULL) {
+function block_admin_display(&$form_state, $theme = NULL) {
   global $theme_key, $custom_theme;
 
   // Add CSS