Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.490
diff -u -p -r1.490 form.inc
--- includes/form.inc	11 Sep 2010 14:38:04 -0000	1.490
+++ includes/form.inc	12 Sep 2010 21:25:29 -0000
@@ -991,7 +991,11 @@ function drupal_validate_form($form_id, 
   if (isset($form['#token'])) {
     if (!drupal_valid_token($form_state['values']['form_token'], $form['#token'])) {
       // Setting this error will cause the form to fail validation.
-      form_set_error('form_token', t('This form is outdated. Reload the page and try again. Contact the site administrator if the problem persists.'));
+      form_set_error('form_token', t('This form was outdated and has been reloaded automatically. Try to submit it again. Contact the site administrator if the problem persists.'));
+      // Setting this value will cause the form to have an up-to-date token
+      // when it is re-displayed, therefore allowing the new copy of the form
+      // to be submitted successfully.
+      $form['form_token']['#value'] = drupal_get_token($form['#token']);
     }
   }