Merge 3.3

diff --cc Makefile.pre.in
index fd0f7e7e6f99de55e43df6779c01ce25612a27b5,dc895c0070c274ed7cd6aa4ad874a5afe3900ec6..1d7b7c3c66f6d13b68d4ba09931f4c0588cb38ba
--- 1/Makefile.pre.in
--- 2/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -941,14 -893,9 +941,11 @@@ buildbottest:    all platfor
                fi
                $(TESTRUNNER) -j 1 -u all -W --timeout=$(TESTTIMEOUT) $(TESTOPTS)
  
- # Like touch, but also working on 2.7 (where the target is a no-op)
- buildbottouch:        touch
- 
  QUICKTESTOPTS=        $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \
                test_multibytecodec test_urllib2_localnet test_itertools \
 -              test_multiprocessing test_mailbox test_socket test_poll \
 +              test_multiprocessing_fork test_multiprocessing_spawn \
 +              test_multiprocessing_forkserver \
 +              test_mailbox test_socket test_poll \
                test_select test_zipfile test_concurrent_futures
  quicktest:    all platform
                $(TESTRUNNER) $(QUICKTESTOPTS)