[Python-checkins] cpython (merge 3.3 -> default): Merge 3.3

[martin.v.loewis]

http://hg.python.org/cpython/rev/50dd4fc1aea1
changeset:   85884:50dd4fc1aea1
parent:      85881:a9a413c42180
parent:      85883:86eff5c4e698
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Mon Sep 30 16:22:05 2013 +0200
summary:
  Merge 3.3

files:
  Makefile.pre.in |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -941,6 +941,9 @@
 		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 \

-- 
Repository URL: http://hg.python.org/cpython