Merged revisions 82409 via svnmerge from

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

........
  r82409 | benjamin.peterson | 2010-06-30 13:41:08 -0500 (Wed, 30 Jun 2010) | 1 line

  an AttributeError is perfectly acceptable here
........