fix for previous commit related to issue 10527 which didn't have the intended effect as per http://bugs.python.org/issue10527#msg179895
Issue #5066: Update IDLE docs

Patch by Todd Rovito
Null merge
Issue #9720: zipfile now writes correct local headers for files larger than 4 GiB.
Issue #9720: zipfile now writes correct local headers for files larger than 4 GiB.
Issue #9720: zipfile now writes correct local headers for files larger than 4 GiB.
Issue #15989: Fix several occurrences of integer overflow
when result of PyLong_AsLong() narrowed to int without checks.
Issue #10527: Use poll() instead of select() for multiprocessing pipes
Dummy merge
Merge
Fix test_socket broken in previous commit (changeset 13e2e44db99d).
Added new checks for socket.setblocking().
Check for NULL before the pointer aligning in fastsearch_memchr_1char.
There is no guarantee that NULL is aligned.
Check for NULL before the pointer aligning in fastsearch_memchr_1char.
There is no guarantee that NULL is aligned.
Issue #14850: Now a chamap decoder treates U+FFFE as "undefined mapping"
in any mapping, not only in an unicode string.
Issue #14850: Now a chamap decoder treates U+FFFE as "undefined mapping"
in any mapping, not only in an unicode string.
Issue #10527: Remove dead code
Merge
Merge
Issue #14850: Now a chamap decoder treates U+FFFE as "undefined mapping"
in any mapping, not only in an unicode string.
Merge heads