Merge from V5_1_4_BR 23/06/2010

diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx
index 53b3c0e3308a36807fa2a1c8edb5d42e385bec11..7096e20ae8a4c3f8017743b6b614efcf21cb643b 100644 (file)
--- a/src/Launcher/Launcher_Job.cxx
+++ b/src/Launcher/Launcher_Job.cxx
@@ -482,7 +482,7 @@ Launcher::Job::common_job_params()
 
   // Time
   if (_maximum_duration_in_second != -1)
-    params[Batch::MAXWALLTIME] = _maximum_duration_in_second;
+    params[Batch::MAXWALLTIME] = _maximum_duration_in_second / 60;
 
   // Queue
   if (_queue != "")