Merged revisions 76270 via svnmerge from

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

................
  r76270 | r.david.murray | 2009-11-14 17:21:32 -0500 (Sat, 14 Nov 2009) | 10 lines

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

  ........
    r76190 | r.david.murray | 2009-11-10 13:58:02 -0500 (Tue, 10 Nov 2009) | 3 lines

    Update the FAQ entry that explains that assignments in the local scope
    shadow variables in the outer scope (issue 7290).
  ........
................