Merge 3.3
diff --git a/Makefile.pre.in b/Makefile.pre.in
index fd0f7e7..1d7b7c3 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -941,9 +941,6 @@
 		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_fork test_multiprocessing_spawn \