svn merge -r11362:11382 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

etc/init.d.slurm

@@ -129,6 +129,8 @@ slurmstatus() {
 #           after slurmctld terminates
             if [ "$base" != "slurmctld" ] ; then
                echo $"${base} dead but pid file exists"
+            else
+               echo $"${base} is stopped"
             fi
             return 1
         fi