Blocked revisions 79298 via svnmerge

Blocked revisions 79298 via svnmerge

................
  r79298 | r.david.murray | 2010-03-22 13:48:48 -0400 (Mon, 22 Mar 2010) | 11 lines

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

  ........
    r79294 | r.david.murray | 2010-03-22 11:55:09 -0400 (Mon, 22 Mar 2010) | 4 lines

    Issue #7860: platform.uname now reports the correct 'machine' type
    when Python is running in WOW64 mode on 64 bit Windows.  Patch by
    Brian Curtin.
  ........
................