svn merge -r13623:13642 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

 (none of these changes were applicable to slurm v1.3, so this is just 
 informational to prevent attemptes to perform a merge).