[Python-checkins] cpython (merge 3.2 -> default): Dummy merge from 3.2

[tim.golden]

http://hg.python.org/cpython/rev/c01eabd1b36e
changeset:   77862:c01eabd1b36e
parent:      77861:9523c122d6fc
parent:      77860:52af10209976
user:        Tim Golden <mail at timgolden.me.uk>
date:        Fri Jun 29 18:45:40 2012 +0100
summary:
  Dummy merge from 3.2

files:



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