--- cvs2cl.orig	2004-05-15 16:20:14.000000000 -0400
+++ cvs2cl	2004-07-03 05:59:58.674792848 -0400
@@ -2035,6 +2035,7 @@
       # It is now safe to split on ':'.
       my ($username, $expansion) = split ':';
       chomp $expansion;
+      $expansion =~ s/^\s*(.*)\s*$/$1/;
       $expansion =~ s/^'(.*)'$/$1/;
       $expansion =~ s/^"(.*)"$/$1/;
 
@@ -2284,14 +2285,15 @@
   #
   # date: 1999/02/19 23:29:05;  author: apharris;  state: Exp;
 
-  my ($year, $mon, $mday, $hours, $min, $secs, $author, $state, $rest) =
+  my ($year, $mon, $mday, $hours, $min, $secs, $tzignore, $tzsign, $tzhours, $tzmin, $author, $state, $rest) =
     $line =~
-      m!(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+
+      m!(\d+)[/-](\d+)[/-](\d+)\s+(\d+):(\d+):(\d+)(\s+([-+])(\d\d)(\d\d))?;\s+
         author:\s+([^;]+);\s+state:\s+([^;]+);(.*)!x
     or  die "Couldn't parse date ``$line''";
   die "Bad date or Y2K issues"
     unless $year > 1969 and $year < 2258;
   # Kinda arbitrary, but useful as a sanity check
+  # TODO: Should handle tzsign, tzhours, tzmin here.
   my $time = timegm($secs, $min, $hours, $mday, $mon-1, $year-1900);
   if ( $rest =~ m!\s+lines:\s+(.*)! ) {
     $self->{lines} = $1;