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

[benjamin.peterson]

http://hg.python.org/cpython/rev/8036d819b7d0
changeset:   70829:8036d819b7d0
parent:      70828:f9651488f256
parent:      70823:cf56abd14eef
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Jun 16 18:51:42 2011 -0500
summary:
  merge heads

files:



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