Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.308
diff -u -p -r1.308 search.module
--- modules/search/search.module	24 Aug 2009 22:03:01 -0000	1.308
+++ modules/search/search.module	28 Aug 2009 00:58:41 -0000
@@ -1111,6 +1111,11 @@ function search_box(&$form_state, $form_
     '#default_value' => '',
     '#attributes' => array('title' => t('Enter the terms you wish to search for.')),
   );
+  // Add a heading for accessibility to search_theme_form, not search_block_form
+  // which has a block heading. See http://drupal.org/node/561750 and 472572.
+  if ($form_id == 'search_theme_form') {
+    $form[$form_id]['#prefix'] = '<h2 class="element-invisible">' . t('Search form') . '</h2>';
+  }
   $form['submit'] = array('#type' => 'submit', '#value' => t('Search'));
   $form['#submit'][] = 'search_box_form_submit';