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

[benjamin.peterson]

https://hg.python.org/cpython/rev/fd658692db3a
changeset: 93084:fd658692db3a
parent: 93083:72cfca354c92
parent: 93078:4135060ecf04
user: Benjamin Peterson <benjamin at python.org>
date: Wed Oct 15 13:40:53 2014 -0400
summary:
Merge heads

files: