Conflicts:
	NEWS

Preserve a job's dependency information with respect to expanding
another job. Previously the dependency information would be purged
from the string almost immediately as part of the logic to designed
to only report current dependency information.

If gang scheduling is configured, then expanding a job can only proceed
if both jobs execute in the same time slice. For now, just disable job
expansion if either job involved in the expansion is suspended. This
limitiation might be removed in the future.

Recent cray-specific patches and some minor code refinements

 1. Simplification by generating the indices via the built-in ipairs function.

 2. Avoid encountering an error when trying to unset job_desc fields by
    assigning the  special Lua value `nil':

    [2011-04-23T13:28:51] error: job_submit/lua: /opt/slurm/default/etc/job_submit.lua:106: \
			bad argument #3 to '_set_job_req_field' (string expected, got nil)
    The error is avoided by testing for a nil value and using an empty string instead.

Tested script to work after applying changes.
Patch from Gerrit Renker, CSCS.

Found while reading mgr.c, often MAXPATHLEN is 1024, but not sure it is always.
Patch from Gerrit Renker, CSCS

This adds user documentation on how memory is specified by ALPS (per-PE share) and SLURM
(per-node or per-CPU units), clarifying the correspondence.
Since it is a correspondence, but not a direct equivalence, the patch also removes the
PBS-script directive support for 'mppmem', since otherwise it would lead to unexpected
behaviour. From Gerrit Renker, CSCS.

Conflicts:
	src/plugins/select/cons_res/select_cons_res.c
	src/plugins/select/linear/select_linear.c

made initial changes to allow setting the correct coordinates in a small block when trying to run sub-block jobs.

New function added: count_job_resources_node(job_resources_t *job_resrcs_ptr,
				    uint32_t node_id);
/* Return the count of core bitmaps set for the specific node */

nodes IF its resources have been merged into another job.

nodes IF its resources have been merged into another job.

Conflicts:
	NEWS