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

[barry.warsaw]

http://hg.python.org/cpython/rev/9a1d902714ae
changeset:   75184:9a1d902714ae
branch:      2.7
parent:      75182:7549dd74e08c
parent:      75183:bff3fd529e33
user:        Barry Warsaw <barry at python.org>
date:        Wed Feb 22 14:27:53 2012 -0500
summary:
  null merge from 2.6

files:



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