--- /tmp/token_cck.inc	2008-03-09 22:30:48.000000000 -0700
+++ token_cck.inc	2008-03-09 22:31:22.000000000 -0700
@@ -222,7 +222,7 @@
 
 
 
-if (module_exists('date')) {
+if ((module_exists('date')) && (!function_exists('date_token_list')) {
   function date_token_list($type = 'all') {
     if ($type == 'field' || $type == 'all') {
       $tokens = array();