Index: date/date_handler_field_multiple.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/date/date/date_handler_field_multiple.inc,v
retrieving revision 1.1.2.12
diff -u -p -r1.1.2.12 date_handler_field_multiple.inc
--- date/date_handler_field_multiple.inc	27 Feb 2009 14:48:34 -0000	1.1.2.12
+++ date/date_handler_field_multiple.inc	26 Jan 2010 15:20:57 -0000
@@ -10,13 +10,24 @@
  */
 class date_handler_field_multiple extends content_handler_field_multiple {
   
-  function options(&$options) {
-    parent::options($options);
+  function option_definition() {
+    $options = parent::option_definition();
     $options['repeat'] = array(
-      'show_repeat_rule' => '',
-      );
-    $options['multiple']['multiple_to'] = ''; 
-    $options['fromto']['fromto'] = 'both'; 
+      'contains' => array(
+        'show_repeat_rule' => array('default' => ''),
+      )
+    );
+    $options['multiple'] = array(
+      'contains' => array(
+        'multiple_to' => array('default' => ''),
+      )
+    );
+    $options['fromto'] = array(
+      'contains' => array(
+        'fromto' => array('default' => 'both'),
+      )
+    );
+    return $options;
   }
   
   /**
@@ -168,4 +179,4 @@ class date_handler_field_multiple extend
     
   }
 
-}
\ No newline at end of file
+}