Merged revisions 78932 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78932 | martin.v.loewis | 2010-03-13 18:53:02 +0100 (Sa, 13 Mär 2010) | 2 lines

  Add 2.6 uuids.
........