svn merge -r11918:11933 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

NEWS

src/plugins/jobcomp/script/jobcomp_script.c

src/plugins/sched/wiki/start_job.c

src/plugins/sched/wiki2/cancel_job.c

src/plugins/sched/wiki2/job_signal.c

src/plugins/sched/wiki2/job_will_run.c

src/plugins/sched/wiki2/sched_wiki.c

src/plugins/sched/wiki2/start_job.c

src/slurmctld/step_mgr.c

src/srun/launch.c