[Python-checkins] cpython (merge 2.6 -> 2.7): null merge from 2.6

[barry.warsaw]

http://hg.python.org/cpython/rev/bd557b03811b
changeset:   75125:bd557b03811b
branch:      2.7
parent:      75123:51c417a7e8f8
parent:      75124:04738f35e0ec
user:        Barry Warsaw <barry at python.org>
date:        Tue Feb 21 10:23:27 2012 -0500
summary:
  null merge from 2.6

files:



-- 
Repository URL: http://hg.python.org/cpython