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

[benjamin.peterson]

http://hg.python.org/cpython/rev/c05839b1ae68
changeset:   75700:c05839b1ae68
branch:      2.7
parent:      75699:ada6bfbeceb8
parent:      75695:11a11e5cac0f
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Mar 14 21:07:00 2012 -0500
summary:
  merge heads

files:



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