--- vss2cvs.pl	Tue Dec  4 02:23:42 2001
+++ vss2cvs-nihon.pl	Fri Mar 29 00:10:40 2002
@@ -354,7 +354,7 @@
 	if(/^Label: "(.+)"$/) {
 	    $label = $1;
 	    $_=myread();
-	}
+	}

 	($user,$timestamp) = parse_user_and_timestamp($_);
 
 	$_=myread();
@@ -542,15 +542,22 @@
 # For U.S. format dates: mm/dd/yy, time as hh:mm[am or pm indicator]
 #
     die "can't parse timestamp $_"
-	unless(address@hidden:[\s]*(.*)\s+Date:\s+(\d+)/(\d+)/(\d+)\s+Time:\s+(\d+):(\d+)([ap])@);
-    my ($user, $mo, $day, $yr, $hr, $min, $sec) = ($1, $2, $3, $4, $5, $6, 0);
-    $user =~ s/[\s]+/_/g;  # eliminate blanks in userid - CVS might not like it
+#   unless(address@hidden:[\s]*(.*)\s+Date:\s+(\d+)/(\d+)/(\d+)\s+Time:\s+(\d+):(\d+)([ap])@);
+#    my ($user, $mo, $day, $yr, $hr, $min, $sec) = ($1, $2, $3, $4, $5, $6, 0);
+#    $user =~ s/[\s]+/_/g;  # eliminate blanks in userid - CVS might not like it
 #
 # For U.K (and other) format dates: dd.mm.yy hh:mm (no am or PM):
 #
 #    unless(address@hidden:[\s]*([^\s]+)\s+Date:\s+(\d+)/(\d+)/(\d+)\s+Time:\s+(\d+):(\d+)([ap]*)@);
 #    my ($user, $day, $mo, $yr, $hr, $min, $sec) = ($1, $2, $3, $4, $5, $6, 0);
 #
+

+#
+# For Japanese format dates: yy.mm.dd hh:mm (no am or PM):
+#
+    unless(address@hidden:[\s]*([^\s]+)\s+“ú•t:\s+(\d+)/(\d+)/(\d+)\s+Žž:\s+(\d+):(\d+)([ap]*)@);
+    my ($user, $yr, $mo, $day, $hr, $min, $sec) = ($1, $2, $3, $4, $5, $6, 0);
+    $user =~ s/[\s]+/_/g;  # eliminate blanks in userid - CVS might not like it
 
     # gmtime returns and
     # timelocal takes  second, minute,  hour,   day, month,  year