[Python-checkins] cpython (merge 3.1 -> 3.2): merge 3.1

[benjamin.peterson]

http://hg.python.org/cpython/rev/85d08a1ba74e
changeset:   75200:85d08a1ba74e
branch:      3.2
parent:      75197:2fe39437e243
parent:      75199:df3b2b5db900
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Feb 23 10:54:28 2012 -0500
summary:
  merge 3.1

files:



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