Merged revisions 76856 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76856 | r.david.murray | 2009-12-16 06:49:46 -0500 (Wed, 16 Dec 2009) | 2 lines

  Issue #7396: fix -s, which was broken by the -j enhancement.
........