Merge with 3.2

diff --cc PC/python3.mak
index ce65fba134bd9688144aabccec06881cbd11cc7d,a7f01cbd9e4016cc089360ebb3e6cf39d1409786..aa5bd0270c392f16dde15e5a16f4171d6c4f779b
--- 1/PC/python3.mak
--- 2/PC/python3.mak
+++ b/PC/python3.mak
@@@ -1,10 -1,10 +1,10 @@@
- $(OutDir)python33.dll:        python3.def $(OutDir)python33stub.lib
+ $(OutDir)python3.dll: python3.def $(OutDir)python32stub.lib
 -      cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python32stub.lib
 +      cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python33stub.lib
  
 -$(OutDir)python32stub.lib:    python32stub.def
 -      lib /def:python32stub.def /out:$(OutDir)python32stub.lib /MACHINE:$(MACHINE)
 +$(OutDir)python33stub.lib:    python33stub.def
 +      lib /def:python33stub.def /out:$(OutDir)python33stub.lib /MACHINE:$(MACHINE)
  
  clean:
 -      del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python32stub.lib $(OutDir)python3.exp $(OutDir)python32stub.exp
 +      del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python33stub.lib $(OutDir)python3.exp $(OutDir)python33stub.exp
  
- rebuild: clean $(OutDir)python33.dll
+ rebuild: clean $(OutDir)python3.dll