Merge of descr-branch back into trunk.
diff --git a/PCbuild/pythoncore.dsp b/PCbuild/pythoncore.dsp
index 83e8016..4995cae 100644
--- a/PCbuild/pythoncore.dsp
+++ b/PCbuild/pythoncore.dsp
@@ -495,6 +495,21 @@
# End Source File
# Begin Source File
+SOURCE=..\Objects\descrobject.c
+
+!IF "$(CFG)" == "pythoncore - Win32 Release"
+
+!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Release"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\Objects\dictobject.c
!IF "$(CFG)" == "pythoncore - Win32 Release"
@@ -1737,6 +1752,21 @@
# End Source File
# Begin Source File
+SOURCE=..\Modules\xxsubtype.c
+
+!IF "$(CFG)" == "pythoncore - Win32 Release"
+
+!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Release"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\Modules\yuvconvert.c
!IF "$(CFG)" == "pythoncore - Win32 Release"