merge 3.2

diff --cc Include/patchlevel.h
Simple merge

diff --cc Makefile.pre.in
Simple merge

diff --cc PC/pyconfig.h
Simple merge

diff --cc Tools/scripts/patchcheck.py
index 0ca712ad31f3d65a44451a977f0adebc8d3eda27,0e18dd9356d413e8d22dd480bc9d6ad0dbf9db01..503c67a027e740fcb5cd74a9db25a6496e5c0660
--- 1/Tools/scripts/patchcheck.py
--- 2/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@@ -132,21 -148,6 +132,21 @@@ def reported_news(file_paths)
      """Check if Misc/NEWS has been changed."""
      return 'Misc/NEWS' in file_paths
  
-     if 'configure.in' in file_paths:
 +@status("configure regenerated", modal=True, info=str)
 +def regenerated_configure(file_paths):
 +    """Check if configure has been regenerated."""
-     if 'configure.in' in file_paths:
++    if 'configure.ac' in file_paths:
 +        return "yes" if 'configure' in file_paths else "no"
 +    else:
 +        return "not needed"
 +
 +@status("pyconfig.h.in regenerated", modal=True, info=str)
 +def regenerated_pyconfig_h_in(file_paths):
 +    """Check if pyconfig.h.in has been regenerated."""
++    if 'configure.ac' in file_paths:
 +        return "yes" if 'pyconfig.h.in' in file_paths else "no"
 +    else:
 +        return "not needed"
  
  def main():
      file_paths = changed_files()

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc pyconfig.h.in
Simple merge