Merged revisions 81843 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81843 | brian.curtin | 2010-06-08 15:57:52 -0500 (Tue, 08 Jun 2010) | 3 lines

  Fix a compile warning missed during porting (wchar_t/char) and move a
  variable declaration outside of a loop. #2810 was when this first went in.
........