diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index ce3a7eb6715b4ccd2cc9b556e5df02ecad3c1872..ef524284099c2aa1cef353a4e7151bcffc1f3d98 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -176,7 +176,8 @@ extern int build_job_queue(struct job_queue **job_queue)
 
 /*
  * job_is_completing - Determine if jobs are in the process of completing.
- * RET - True of any job is in the process of completing
+ * RET - True of any job is in the process of completing AND 
+ *	 CompleteWait is configured non-zero
  * NOTE: This function can reduce resource fragmentation, which is a 
  * critical issue on Elan interconnect based systems.
  */
diff --git a/src/slurmctld/job_scheduler.h b/src/slurmctld/job_scheduler.h
index e8a06472b78519f330a5590669a7b65abda5c101..5c37b9b29439015a2f3334bbb1598328268148f9 100644
--- a/src/slurmctld/job_scheduler.h
+++ b/src/slurmctld/job_scheduler.h
@@ -3,7 +3,7 @@
  *	of pending jobs in priority order
  *****************************************************************************
  *  Copyright (C) 2002-2007 The Regents of the University of California.
- *  Copyright (C) 2008 Lawrence Livermore National Security.
+ *  Copyright (C) 2008-2009 Lawrence Livermore National Security.
  *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
  *  Written by Morris Jette <jette@llnl.gov>, et. al.
  *  Derived from dsh written by Jim Garlick <garlick1@llnl.gov>
@@ -19,7 +19,7 @@
  *  any later version.
  *
  *  In addition, as a special exception, the copyright holders give permission 
- *  to link the code of portions of this program with the OpenSSL library under 
+ *  to link the code of portions of this program with the OpenSSL library under
  *  certain conditions as described in each individual source file, and 
  *  distribute linked combinations including the two. You must obey the GNU 
  *  General Public License in all respects for all of the code used other than 
@@ -76,11 +76,11 @@ extern int epilog_slurmctld(struct job_record *job_ptr);
 
 /*
  * job_is_completing - Determine if jobs are in the process of completing.
- * RET - True of any job is in the process of completing
+ * RET - True of any job is in the process of completing AND 
+ *	 CompleteWait is configured non-zero
  * NOTE: This function can reduce resource fragmentation, which is a 
  * critical issue on Elan interconnect based systems.
  */
-
 extern bool job_is_completing(void);
 
 /* Determine if a pending job will run using only the specified nodes