Merge 3.2

diff --cc Doc/library/argparse.rst
Simple merge

diff --cc Makefile.pre.in
index c97c7ca5605c0d02b0584d43851883a307e74f70,1108c75eca76c46cff884a7c942fce4dadc6467a..071c80b35898b26d5d0197b2a7229e9da095e3f0
--- 1/Makefile.pre.in
--- 2/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' \