svn merge -r12131:12134 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

testsuite/expect/Makefile.am

@@ -264,6 +264,7 @@ EXTRA_DIST = \
 	test17.28			\
 	test17.29			\
 	test17.30			\
+	test17.31			\
 	test19.1			\
 	test19.2			\
 	test19.3			\

testsuite/expect/Makefile.in

@@ -490,6 +490,7 @@ EXTRA_DIST = \
 	test17.28			\
 	test17.29			\
 	test17.30			\
+	test17.31			\
 	test19.1			\
 	test19.2			\
 	test19.3			\

testsuite/expect/README

@@ -440,7 +440,7 @@ test17.27  Test that a job executes with the specified nodes, requires multiple
 test17.28  Tests #SBATCH entry functionality in a batch script.
 test17.29  Verify that command arguments get forwarded to job script.
 test17.30  Test of comment field specification (--comment option).
-test17.28  Tests #PBS entry functionality in a batch script.
+test17.31  Tests #PBS entry functionality in a batch script.
 
 
 test19.#   Testing of strigger options.