svn merge -r10123:10186 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

Includes Mark Grondona's addition of the slurm_spank_local_user_init()
function, with my massaging to make it more compatible with the trunk code.
However, there is no support in the trunk API task launch code (and therefore
slaunch) for slurm_spank_local_user_init().  I will add that in a future
commit.