Merging in changes from r23a1-branch.  Doc/makefile had conflicts, which
I leave to Fred to sort out.
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 239e6b7..f2a9ca4 100644
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1973,6 +1973,12 @@
   Description=email test data
   Flags=0000000000000010
 end
+item: Install File
+  Source=..\lib\email\test\data\*.au
+  Destination=%MAINDIR%\Lib\email\test\data
+  Description=email test data
+  Flags=0000000000000010
+end
 item: Remark
 end
 item: Install File