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

[jesus.cea]

http://hg.python.org/cpython/rev/0560f023a28d
changeset:   69501:0560f023a28d
branch:      3.2
parent:      69500:d3810c1428ad
parent:      69499:b20d3f54366c
user:        Jesus Cea <jcea at jcea.es>
date:        Wed Apr 20 22:40:48 2011 +0200
summary:
  merge

files:



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