[Python-checkins] cpython (merge default -> default): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/2d5de8f19957
changeset:   70895:2d5de8f19957
parent:      70894:9a6d9ac6fb2e
parent:      70893:631b20cca746
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Jun 19 19:55:19 2011 -0500
summary:
  merge heads

files:



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