[Python-checkins] cpython (merge 3.2 -> default): merge 3.2 (#13766)

[benjamin.peterson]

http://hg.python.org/cpython/rev/ecc998ec8c6f
changeset:   74426:ecc998ec8c6f
parent:      74424:4cf9f7dc32c2
parent:      74425:8f7e707ab729
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Jan 15 21:28:13 2012 -0500
summary:
  merge 3.2 (#13766)

files:
  Lib/lib2to3/Grammar.txt |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/lib2to3/Grammar.txt b/Lib/lib2to3/Grammar.txt
--- a/Lib/lib2to3/Grammar.txt
+++ b/Lib/lib2to3/Grammar.txt
@@ -1,4 +1,4 @@
-# Grammar for Python
+# Grammar for 2to3. This grammar supports Python 2.x and 3.x.
 
 # Note:  Changing the grammar specified in this file will most likely
 #        require corresponding changes in the parser module

-- 
Repository URL: http://hg.python.org/cpython