Merged revisions 70686 via svnmerge from

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

................
  r70686 | mark.dickinson | 2009-03-29 17:34:21 +0100 (Sun, 29 Mar 2009) | 15 lines

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

  ........
    r70682 | mark.dickinson | 2009-03-29 17:17:16 +0100 (Sun, 29 Mar 2009) | 3 lines

    Issue #532631:  Add paranoid check to avoid potential buffer overflow
    on systems with sizeof(int) > 4.
  ........
    r70684 | mark.dickinson | 2009-03-29 17:24:29 +0100 (Sun, 29 Mar 2009) | 3 lines

    Issue #532631: Apply floatformat changes to unicodeobject.c
    as well as stringobject.c.
  ........
................