merge

diff --cc Lib/test/datetimetester.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
Simple merge

diff --cc Modules/_datetimemodule.c
Simple merge