merge 3.1

diff --cc Include/patchlevel.h
Simple merge

diff --cc Makefile.pre.in
index 3008d6d73ad02b456149440afc7456d39957bbfd,e01cd2745af8c586b8987354418cbc89ac3fe450..a85f8ddf1cb4621b3d417a3e0a2f894c2f0a3489
--- 1/Makefile.pre.in
--- 2/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -158,10 -148,10 +158,10 @@@ CONFIG_ARGS=    @CONFIG_ARGS
  SRCDIRS=      @SRCDIRS@
  
  # Other subdirectories
 -SUBDIRSTOO=   Include Lib Misc Demo
 +SUBDIRSTOO=   Include Lib Misc
  
  # Files and directories to be distributed
- CONFIGFILES=  configure configure.in acconfig.h pyconfig.h.in Makefile.pre.in
+ CONFIGFILES=  configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in
  DISTFILES=    README ChangeLog $(CONFIGFILES)
  DISTDIRS=     $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
  DIST=         $(DISTFILES) $(DISTDIRS)
@@@ -1210,10 -1137,10 +1210,10 @@@ recheck
        $(SHELL) config.status --recheck
        $(SHELL) config.status
  
- # Rebuild the configure script from configure.in; also rebuild pyconfig.h.in
+ # Rebuild the configure script from configure.ac; also rebuild pyconfig.h.in
  autoconf:
 -      (cd $(srcdir); autoconf)
 -      (cd $(srcdir); autoheader)
 +      (cd $(srcdir); autoconf -Wall)
 +      (cd $(srcdir); autoheader -Wall)
  
  # Create a tags file for vi
  tags::

diff --cc PC/pyconfig.h
Simple merge

diff --cc configure
index 5f00c1ecfafbee1545925aa1c72aac6febf89844,e928bf87b2ea2a178cbda6a2f3776c92cc20e7cc..9e7cfc06b2cc42af86fe77f90ab23507e61225fa
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,7 -1,7 +1,7 @@@
  #! /bin/sh
- # From configure.in Revision.
+ # From configure.ac Revision.
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.68 for python 3.1.
 +# Generated by GNU Autoconf 2.68 for python 3.2.
  #
  # Report bugs to <http://bugs.python.org/>.
  #

diff --cc configure.ac
Simple merge

diff --cc pyconfig.h.in
Simple merge