[Python-checkins] cpython (merge 3.3 -> default): Propagate dummy merge from 3.3

[nick.coghlan]

http://hg.python.org/cpython/rev/643002d416e8
changeset:   79830:643002d416e8
parent:      79824:edeeb727df86
parent:      79829:3f6db10b7a69
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Fri Oct 19 23:01:45 2012 +1000
summary:
  Propagate dummy merge from 3.3

files:



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