Recorded merge of revisions 82474 via svnmerge from

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

........
  r82474 | georg.brandl | 2010-07-03 10:40:13 +0200 (Sa, 03 Jul 2010) | 1 line

  Fix role name.
........