=== modified file 'modules/field/modules/list/list.module'
--- modules/field/modules/list/list.module	2010-09-04 15:40:51 +0000
+++ modules/field/modules/list/list.module	2010-09-30 17:37:11 +0000
@@ -87,7 +87,7 @@ function list_field_settings_form($field
       '#type' => 'markup',
       '#description' => '',
       '#input' => TRUE,
-      '#value_callback' => 'list_boolean_allowed_values_callback',
+      '#process' => array('list_boolean_process'),
       '#access' => empty($settings['allowed_values_function']),
     );
     $form['allowed_values']['on'] = array(
@@ -156,13 +156,15 @@ function list_allowed_values_setting_val
 /**
 * Form element #value_callback: assembles the allowed values for 'boolean' fields.
 */
-function list_boolean_allowed_values_callback($element, $edit = FALSE) {
-  if ($edit !== FALSE) {
-    $on = $edit['on'];
-    $off = $edit['off'];
-    $edit = "0|$off\n1|$on";
-    return $edit;
+function list_boolean_process($element, $form_state) {
+  if ($form_state['process_input']) {
+    $on = $element['#value']['on'];
+    $off = $element['#value']['off'];
+    $element['#value'] = "0|$off\n1|$on";
+    $element['on']['#value'] = $on;
+    $element['off']['#value'] = $on;
   }
+  return $element;
 }
 
 /**

=== modified file 'modules/field/modules/list/tests/list.test'
--- modules/field/modules/list/tests/list.test	2010-08-05 23:53:37 +0000
+++ modules/field/modules/list/tests/list.test	2010-09-30 17:33:44 +0000
@@ -134,26 +134,37 @@ class ListFieldUITestCase extends FieldT
   function testAllowedValues() {
     $element_name = "field[settings][allowed_values]";
 
-    //Test 'List' field type.
+    // Test 'List' field type.
     $admin_path = $this->createListFieldAndEdit('list');
-    //Check that non-integer keys are rejected.
+    // Check that non-integer keys are rejected.
     $edit = array($element_name => "1.1|one\n");
     $this->drupalPost($admin_path, $edit, t('Save settings'));
     $this->assertText("keys must be integers", t('Form validation failed.'));
 
     // Test 'List (number)' field type.
     $admin_path = $this->createListFieldAndEdit('list_number');
-    //Check that non-numeric keys are rejected.
+    // Check that non-numeric keys are rejected.
     $edit = array($element_name => "1|one\nB|two");
     $this->drupalPost($admin_path, $edit, t('Save settings'));
     $this->assertText("each key must be a valid integer or decimal", t('Form validation failed.'));
 
-    //Test 'List (text)' field type.
+    // Test 'List (text)' field type.
     $admin_path = $this->createListFieldAndEdit('list_text');
-    //Check that over long keys are rejected.
+    // Check that over long keys are rejected.
     $edit = array($element_name => "1|one\n" . $this->randomName(256) . "|two");
     $this->drupalPost($admin_path, $edit, t('Save settings'));
     $this->assertText("each key must be a string at most 255 characters long", t('Form validation failed.'));
+
+    // Test 'Boolean' field type.
+    $admin_path = $this->createListFieldAndEdit('list_boolean');
+    // Check that the seperate 'On' and 'Off' form fields work.
+    $edit = array(
+      $element_name . '[on]' => $this->randomName(),
+      $element_name . '[off]' => $this->randomName(),
+    );
+    $this->drupalPost($admin_path, $edit, t('Save settings'));
+    $this->assertText("Saved test_list_boolean configuration.", t("The 'On' and 'Off' form fields work for boolean fields."));
+    
   }
 
   /**