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

........
  r63397 | benjamin.peterson | 2008-05-16 17:59:28 -0500 (Fri, 16 May 2008) | 2 lines

  mention Py3k in glossary
........
  r63673 | benjamin.peterson | 2008-05-26 07:29:46 -0500 (Mon, 26 May 2008) | 2 lines

  some updates to string formatting section in whatsnew
........
2 files changed