[Python-checkins] r76859 - python/branches/release31-maint

[r.david.murray]

Author: r.david.murray
Date: Wed Dec 16 16:21:43 2009
New Revision: 76859

Log:
Blocked revisions 76857 via svnmerge

................
  r76857 | r.david.murray | 2009-12-16 10:19:27 -0500 (Wed, 16 Dec 2009) | 9 lines
  
  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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)