svn merge -r17869:17877 https://eris.llnl.gov/svn/slurm/branches/slurm-2.0

NEWS

doc/html/reservations.shtml

doc/man/man1/scontrol.1

doc/man/man1/srun.1

slurm/slurm.h.in

src/common/slurm_protocol_defs.c

src/plugins/task/affinity/dist_tasks.c

src/scontrol/create_res.c

src/slurmctld/reservation.c