[Python-checkins] cpython (merge 2.6 -> 2.7): Forward merge.

[barry.warsaw]

http://hg.python.org/cpython/rev/0accdef90b4b
changeset:   70283:0accdef90b4b
branch:      2.7
parent:      70270:d5771ed4ec4e
parent:      70282:4e5f161f667c
user:        Barry Warsaw <barry at python.org>
date:        Sun May 22 21:17:49 2011 -0400
summary:
  Forward merge.

files:



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