Issue #19544, #6516: check ZLIB_SUPPORT, not zlib (which might not be bound)
Issue19619: skip zlib error test when zlib not available
Issue #19544, #6516: check ZLIB_SUPPORT, not zlib (which might not be bound)
Update pip to 1.5rc4
Update setuptools to 2.0.2
whatsnew: epoll supports with.

Also reworded the description of the feature in the docs.
whatsnew: argparse FileType accepts errors and encodings args.
str subclasses may have non-empty __slots__, bytes subclasses can't.
Merge with 3.3
whatsnew: afic.open supports 'with'.
whatsnew: random.getrandbits performance.

Also fix a NEWS file issue number error, and some spacing fixes in whatsnew.
whatsnew: mock called_with improvements, socket CAN_BCM support.

Also reworded the other entries in the socket section of whatsnew, as
well as a couple of unrelated news entries.
Clarify the wording of a news entry.
Merge: Clarify the wording of a news entry.
Issue #20055: Fix test_shutil under Windows with symlink privileges held.
Patch by Vajrasky Kok.
Issue #20055: Fix test_shutil under Windows with symlink privileges held.
Patch by Vajrasky Kok.
update copyright year
merge 3.3
Update copyright dates in Mac plists.
Update copyright dates in Mac plists.