--- token_cck.inc.current	2007-04-14 14:39:58.000000000 +0200
+++ token_cck.inc	2007-05-30 13:35:24.000000000 +0200
@@ -253,13 +253,14 @@ function content_token_list($type = 'all
     if ($type == 'field') {
       include_once(drupal_get_path('module', 'date') .'/date.inc');
       $item = $object[0];
-
-      $date = date_make_date(trim($item['value']));
-      $timestamp = date_fuzzy_stamp($date);
       
+      $item['value'] = trim($item['value']);
+      $item_format = (is_numeric($item['value']) ? DATE_UNIX : DATE_ISO);
+      $date = date_make_date($item['value'], 'none', 'local', $item_format);
+
       $tokens['value']          = $item['value'];
       $tokens['view']           = $item['view'];
-      $tokens['timestamp']      = $timestamp;
+      $tokens['timestamp']      = $date->local->timestamp;
       $tokens['yyyy']           = date_show_date($date, 'Y');
       $tokens['yy']             = date_show_date($date, 'y');
       $tokens['month']          = date_show_date($date, 'F');
@@ -274,12 +275,14 @@ function content_token_list($type = 'all
       $tokens['d']              = date_show_date($date, 'j');
 
       if (!empty($item['value2'])) {
-        $date = date_make_date(trim($item['value']));
-        $timestamp = date_fuzzy_stamp($date);
-
-        $tokens['to-value']          = $item['value'];
-        $tokens['to-view']           = $item['view'];
-        $tokens['to-timestamp']      = $timestamp;
+      
+        $item['value2'] = trim($item['value2']);
+        $item_format = (is_numeric($item['value2']) ? DATE_UNIX : DATE_ISO);
+        $date = date_make_date($item['value2'], 'none', 'local', $item_format);
+      
+        $tokens['to-value']          = $item['value2'];
+        $tokens['to-view']           = $item['view2'];
+        $tokens['to-timestamp']      = $date->local->timestamp;
         $tokens['to-yyyy']           = date_show_date($date, 'Y');
         $tokens['to-yy']             = date_show_date($date, 'y');
         $tokens['to-month']          = date_show_date($date, 'F');
@@ -296,4 +299,4 @@ function content_token_list($type = 'all
       return $tokens;
     }
   }
-}
\ No newline at end of file
+}