--- token_cck.inc.orig	2007-10-16 10:37:59.000000000 -0400
+++ token_cck.inc	2008-03-12 13:08:32.000000000 -0400
@@ -222,7 +222,7 @@ if (module_exists('imagefield')) {
 
 
 
-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();