svn merge -r10714:10719 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

src/common/env.c

src/common/env.h

src/plugins/sched/wiki2/get_jobs.c

src/srun/allocate.c

src/srun/opt.c

src/srun/opt.h