Merge changes from r22a2-branch back into trunk.  Also, change patch
level to 2.2a2+
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 0ea9f78..9cddb5f 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -6,6 +6,9 @@
 import unittest
 import warnings
 
+warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, __name__)
+warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, __name__)
+
 from test_support import TESTFN, run_unittest