From: Éric Araujo <merwok@netwok.org>
Date: Wed, 10 Aug 2011 19:42:23 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1712^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9715b9001fbbcacee1b3a2b3927ca4e3729bda7;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

e9715b9001fbbcacee1b3a2b3927ca4e3729bda7
diff --cc Makefile.pre.in
index c97c7ca5605c,1108c75eca76..071c80b35898
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -1331,8 -1283,9 +1331,8 @@@ smelly: al
  
  # Find files with funny names
  funny:
- 	find $(DISTDIRS) \
- 		-o -type d \
+ 	find $(SUBDIRS) $(SUBDIRSTOO) \
 -		-name .svn -prune \
 -		-o -type d \
++		-type d \
  		-o -name '*.[chs]' \
  		-o -name '*.py' \
  		-o -name '*.pyw' \