[Python-checkins] cpython (merge 3.2 -> default): Block 78699:019a2390b014, this needs to be manually merged.

[trent.nelson]

http://hg.python.org/cpython/rev/aa7df57dfe2a
changeset:   78700:aa7df57dfe2a
parent:      78697:ca54c27a9045
parent:      78699:019a2390b014
user:        Trent Nelson <trent at trent.me>
date:        Tue Aug 21 23:48:55 2012 +0000
summary:
  Block 78699:019a2390b014, this needs to be manually merged.

files:



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