Index: date/date_token.inc
===================================================================
--- date/date_token.inc
+++ date/date_token.inc
@@ -26,6 +26,10 @@ function date_token_list($type = 'all') 
     $tokens['date']['dd']             = t("Date day (two digit, zero-padded)");
     $tokens['date']['d']              = t("Date day (one or two digit)");
     $tokens['date']['time']           = t("Time H:i");
+    $tokens['date']['time12g']        = t("12-hour format hour and minute without leading zeros");	
+    $tokens['date']['time12h']        = t("12-hour format hour and minute with leading zeros");		
+    $tokens['date']['ampm']           = t("Lowercase Ante meridiem and Post meridiem (am or pm)");
+    $tokens['date']['AMPM']           = t("Uppercase Ante meridiem and Post meridiem (AM or PM)");	
     
     $tokens['date']['to-????']        = t("If the field has a to-date defined, the same tokens exist in the form: [to-????], where ???? is the normal token.");
 
@@ -62,6 +66,10 @@ function date_token_values($type, $objec
     $tokens['dd']             = !empty($date) ? date_format_date($date, 'custom', 'd') : '';
     $tokens['d']              = !empty($date) ? date_format_date($date, 'custom', 'j') : '';
     $tokens['time']           = !empty($date) ? date_format_date($date, 'custom', 'H:i') : '';
+    $tokens['time12g']        = !empty($date) ? date_format_date($date, 'custom', 'g:i') : '';
+    $tokens['time12h']        = !empty($date) ? date_format_date($date, 'custom', 'h:i') : '';
+    $tokens['ampm']           = !empty($date) ? date_format_date($date, 'custom', 'a') : '';
+    $tokens['AMPM']           = !empty($date) ? date_format_date($date, 'custom', 'A') : '';
 
     if (!empty($item['value2'])) {
 
@@ -88,6 +96,10 @@ function date_token_values($type, $objec
       $tokens['to-dd']             = !empty($date) ? date_format_date($date, 'custom', 'd') : '';
       $tokens['to-d']              = !empty($date) ? date_format_date($date, 'custom', 'j') : '';
       $tokens['to-time']           = !empty($date) ? date_format_date($date, 'custom', 'H:i') : '';
+      $tokens['time12g']           = !empty($date) ? date_format_date($date, 'custom', 'g:i') : '';
+      $tokens['time12h']           = !empty($date) ? date_format_date($date, 'custom', 'h:i') : '';
+      $tokens['ampm']              = !empty($date) ? date_format_date($date, 'custom', 'a') : '';
+      $tokens['AMPM']              = !empty($date) ? date_format_date($date, 'custom', 'A') : '';
 
     }
     return $tokens;