First merge from the trunk straight into the py3k branch. I'm not
using the message generated by svnmerge, because it contains a lot of
stuff about the Doc tree, which I'm not merging this time due to the
way the Doc tree was initially added. I am however adding roman.py
which was added later to Doc/tools. I'll try to diff the two Doc
trees separately to see if there's stuff I missed.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 93c6ba7..adf470f 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -104,6 +104,7 @@
pythondll_uuid = {
"24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}",
"25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}"
+ "26":"{34ebecac-f046-4e1c-b0e3-9bac3cdaacfa}",
} [major+minor]
# Build the mingw import library, libpythonXY.a