svn merge -r17028:17040 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3

We actually want to preserve the set_oomadj() function in slurm v1.4, but
have removed it completely from v1.3.

NEWS

@@ -22,7 +22,7 @@ documents those changes that are of interest to users and admins.
  -- Set "/proc/self/oom_adj" for slurmd and slurmstepd daemons based upon
     the values of SLURMD_OOM_ADJ and SLURMSTEPD_OOM_ADJ environment 
     variables. This can be used to prevent daemons being killed when
-    a node's memory is exhausted.
+    a node's memory is exhausted. Based upon patch by Hongjia  Cao, NUDT.
 
 * Changes in SLURM 1.4.0-pre9
 =============================