Index: form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.281
diff -u -r1.281 form.inc
--- form.inc	17 Aug 2008 11:08:23 -0000	1.281
+++ form.inc	27 Aug 2008 07:14:42 -0000
@@ -525,13 +525,15 @@
   // for the hook_form_alter() implementations.
   // @todo: Remove this in Drupal 7.
   $data = &$form;
-  $data['__drupal_alter_by_ref'] = array(&$form_state);
-  drupal_alter('form_' . $form_id, $data);
 
   // __drupal_alter_by_ref is unset in the drupal_alter() function, we need
   // to repopulate it to ensure both calls get the data.
   $data['__drupal_alter_by_ref'] = array(&$form_state);
   drupal_alter('form', $data, $form_id);
+
+  $data['__drupal_alter_by_ref'] = array(&$form_state);
+  drupal_alter('form_' . $form_id, $data);
+
 }