Actually this was merged by hand because svnmerge messed up the properties

Actually this was merged by hand because svnmerge messed up the properties
on the merge of revision 71067 presumably as a result of my immediately
previous fix for Brett's fix for his fix....

Merged revisions 71067 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r71067 | r.david.murray | 2009-04-02 15:44:43 -0400 (Thu, 02 Apr 2009) | 13 lines

  In 3k this becomes an items() call.

  Merged revisions 71046 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r71046 | r.david.murray | 2009-04-02 10:05:35 -0400 (Thu, 02 Apr 2009) | 4 lines

    Add missing iteritems() call to the for loop in mailbox.MH.get_message().

    Fixes issue2625.
  ........
................