--- nfo/perl/libs/Date/Merge.pm	2002/12/23 13:44:53	1.2
+++ nfo/perl/libs/Date/Merge.pm	2005/08/11 14:13:23	1.4
@@ -1,7 +1,13 @@
 ## ------------------------------------------------------------------------
-##  $Id: Merge.pm,v 1.2 2002/12/23 13:44:53 joko Exp $
+##  $Id: Merge.pm,v 1.4 2005/08/11 14:13:23 jonen Exp $
 ## ------------------------------------------------------------------------
 ##  $Log: Merge.pm,v $
+##  Revision 1.4  2005/08/11 14:13:23  jonen
+##  + bugfix
+##
+##  Revision 1.3  2003/02/09 16:15:51  joko
+##  + minor update regarding module namespace refactoring
+##
 ##  Revision 1.2  2002/12/23 13:44:53  joko
 ##  + sub stripDayName
 ##
@@ -25,7 +31,7 @@
 
 
 use Date::Manip;
-use libp qw( today );
+use shortcuts qw( today );
 
 
 sub mergeDayAndTime {
@@ -45,12 +51,13 @@
           
               $date_day_raw =~ s/[^\d|-]//g;
               my $date_day = ParseDate($date_day_raw);
-    
+                  
               # $date_time (just the time!) will get auto-converted to a datetime from today, so ....
               my $date_time = ParseDate($date_time_raw);
 
               # ... we should calculate the delta to get the real time-shift to continue further processing with
-              my $date_time_delta = DateCalc(ParseDate(today()), '-' . $date_time);
+              #my $date_time_delta = DateCalc(ParseDate(today()), '-' . $date_time);
+              my $date_time_delta = DateCalc(ParseDate(today()), $date_time);
 
               # add the delta to the 'date-day' parsed above to calculate the complete event-date ('endtime' in this case)
               my $date_complete = DateCalc($date_day, $date_time_delta);