=== modified file 'includes/form.inc'
--- includes/form.inc	2006-12-06 15:49:45 +0000
+++ includes/form.inc	2006-12-12 16:19:42 +0000
@@ -89,7 +89,7 @@ function drupal_get_form($form_id) {
     $form = call_user_func_array('drupal_retrieve_form', $args);
     unset($_SESSION['form'][$_POST['form_build_id']]);
     if (isset($form['#multistep']) && $form['#multistep']) {
-      $_SESSION['form'][$form_build_id] = $args;
+      $_SESSION['form'][$form_build_id] = array('timestamp' => time(), 'args' => $args);
       $form['#build_id'] = $form_build_id;
     }
     drupal_prepare_form($args[0], $form);
@@ -924,7 +924,7 @@ function form_select_options($element, $
     }
     else {
       $key = (string)$key;
-      if ($value_valid && ($element['#value'] == $key || ($value_is_array && in_array($key, $element['#value'])))) {
+      if ($value_valid && ((string)$element['#value'] === $key || ($value_is_array && in_array($key, $element['#value'])))) {
         $selected = ' selected="selected"';
       }
       else {