--- token_comment.inc	2008-07-14 18:07:04.000000000 +0200
+++ token_comment.inc	2008-11-16 07:07:19.000000000 +0100
@@ -51,6 +51,13 @@ function comment_token_values($type, $ob
       $values['comment-ddd']             = date('D', $comment->timestamp);
       $values['comment-dd']              = date('d', $comment->timestamp);
       $values['comment-d']               = date('j', $comment->timestamp);
+      $values['comment-g']     		 = date('g', $comment->timestamp);
+      $values['comment-G']            	 = date('G', $comment->timestamp);
+      $values['comment-h']         	 = date('h', $comment->timestamp);
+      $values['comment-H']            	 = date('H', $comment->timestamp);
+      $values['comment-i']             	 = date('i', $comment->timestamp);
+      $values['comment-s']            	 = date('s', $comment->timestamp);
+      $values['comment-U']               = date('U', $comment->timestamp);
       break;
   }
 
@@ -85,7 +92,14 @@ function comment_token_list($type = 'all
     $tokens['comment']['comment-ddd']             = t("Comment creation day (abbreviation)");
     $tokens['comment']['comment-dd']              = t("Comment creation day (two digit, zero-padded)");
     $tokens['comment']['comment-d']               = t("Comment creation day (one or two digit)");
+    $tokens['comment']['comment-g']               = t("Comment creation time (12-hour format, without leading zeros)");
+    $tokens['comment']['comment-G']               = t("Comment creation time (24-hour format, without leading zeros)");
+    $tokens['comment']['comment-h']               = t("Comment creation time (12-hour format, with leading zeros)");
+    $tokens['comment']['comment-H']               = t("Comment creation time (24-hour format, with leading zeros)");
+    $tokens['comment']['comment-i']               = t("Comment creation minute (with leading zeros)");
+    $tokens['comment']['comment-s']               = t("Comment creation second (with leading zeros)");
+    $tokens['comment']['comment-U']               = t("Comment creation time since Epoch (seconds since January 1, 1970)");
 
     return $tokens;
   }
-}
\ No newline at end of file
+}