[Python-checkins] cpython (merge 3.2 -> default): Issue #13093: Perform a real merge.

[charles-francois.natali]

http://hg.python.org/cpython/rev/52fecdc1c5d8
changeset:   73692:52fecdc1c5d8
parent:      73689:dc52db0fa2e5
parent:      73691:311bb5e65b02
user:        Charles-François Natali <neologix at free.fr>
date:        Tue Nov 22 18:53:49 2011 +0100
summary:
  Issue #13093: Perform a real merge.

files:



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