Index: token_cck.inc
===================================================================
--- token_cck.inc	(revision 1284)
+++ token_cck.inc	(working copy)
@@ -261,18 +261,18 @@
       $tokens['value']          = $item['value'];
       $tokens['view']           = $item['view'];
       $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');
-      $tokens['mon']            = date_show_date($date, 'M');
-      $tokens['mm']             = date_show_date($date, 'm');
-      $tokens['m']              = date_show_date($date, 'n');
-      $tokens['ww']             = date_show_date($date, 'W');
-      $tokens['date']           = date_show_date($date, 'N');
-      $tokens['day']            = date_show_date($date, 'l');
-      $tokens['ddd']            = date_show_date($date, 'D');
-      $tokens['dd']             = date_show_date($date, 'd');
-      $tokens['d']              = date_show_date($date, 'j');
+      $tokens['yyyy']           = date_format_date($date, 'custom', 'Y');
+      $tokens['yy']             = date_format_date($date, 'custom', 'y');
+      $tokens['month']          = date_format_date($date, 'custom', 'F');
+      $tokens['mon']            = date_format_date($date, 'custom', 'M');
+      $tokens['mm']             = date_format_date($date, 'custom', 'm');
+      $tokens['m']              = date_format_date($date, 'custom', 'n');
+      $tokens['ww']             = date_format_date($date, 'custom', 'W');
+      $tokens['date']           = date_format_date($date, 'custom', 'N');
+      $tokens['day']            = date_format_date($date, 'custom', 'l');
+      $tokens['ddd']            = date_format_date($date, 'custom', 'D');
+      $tokens['dd']             = date_format_date($date, 'custom', 'd');
+      $tokens['d']              = date_format_date($date, 'custom', 'j');
 
       if (!empty($item['value2'])) {