[Python-checkins] cpython (merge default -> default): Merge.

[alexander.belopolsky]

http://hg.python.org/cpython/rev/168768bf428d
changeset:   85029:168768bf428d
parent:      85028:604e3199acc0
parent:      85027:46df6526438f
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Sun Aug 04 15:19:49 2013 -0400
summary:
  Merge.

files:



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