Merge branch 3.2

diff --cc Lib/test/test_mailbox.py
index 17aebc7a714f71248716bf677671a36795b9086b,007c419b9decaf53133566351d07b2e83efa5786..a1c684e0c56861a9e7798289a5d0a6141f297eb9
--- 1/Lib/test/test_mailbox.py
--- 2/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@@ -921,9 -926,11 +926,10 @@@ class TestMaildir(TestMailbox)
          self.assertFalse(refreshed())
  
          # Now, write something into cur and remove it.  This changes
-         # the mtime and should cause a re-read.
+         # the mtime and should cause a re-read. Note that "sleep
+         # emulation" is still in effect, as skewfactor is -3.
          filename = os.path.join(self._path, 'cur', 'stray-file')
 -        f = open(filename, 'w')
 -        f.close()
 +        support.create_empty_file(filename)
          os.unlink(filename)
          self._box._refresh()
          self.assertTrue(refreshed())