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

[benjamin.peterson]

http://hg.python.org/cpython/rev/1ff72360ceb6
changeset:   80783:1ff72360ceb6
branch:      3.2
parent:      80778:d8300842a0e9
parent:      80782:03b3124e9ea3
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Dec 09 10:14:42 2012 -0500
summary:
  merge 3.1

files:



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