[Python-checkins] cpython (merge 3.3 -> default): Issue #15494: merge from 3.3

[ned.deily]

http://hg.python.org/cpython/rev/4df2e094f83e
changeset:   84922:4df2e094f83e
parent:      84920:c7d9a2159c6c
parent:      84921:e6f2f3eda290
user:        Ned Deily <nad at acm.org>
date:        Tue Jul 30 14:32:52 2013 -0700
summary:
  Issue #15494: merge from 3.3

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


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1012,7 +1012,7 @@
 		tkinter/test/test_ttk site-packages test \
 		test/capath test/data \
 		test/cjkencodings test/decimaltestdata test/xmltestdata \
-		test/subprocessdata test/sndhdrdata \
+		test/subprocessdata test/sndhdrdata test/support \
 		test/tracedmodules test/encoded_modules \
 		test/namespace_pkgs \
 		test/namespace_pkgs/both_portions \

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