Merged revisions 72874 via svnmerge from

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

................
  r72874 | benjamin.peterson | 2009-05-23 14:36:27 -0500 (Sat, 23 May 2009) | 13 lines

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

  ........
    r72871 | benjamin.peterson | 2009-05-23 14:24:37 -0500 (Sat, 23 May 2009) | 1 line

    support building with subversion 1.7 #6094
  ........
    r72872 | benjamin.peterson | 2009-05-23 14:31:02 -0500 (Sat, 23 May 2009) | 1 line

    reorder name
  ........
................