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

[benjamin.peterson]

http://hg.python.org/cpython/rev/f71f65caf53e
changeset:   88396:f71f65caf53e
parent:      88393:51dc9b2a5b35
parent:      88395:4f74ea7eba03
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Jan 10 09:24:59 2014 -0600
summary:
  null merge from 3.3

files:



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