Merged revisions 81906 via svnmerge from

benjaminp · benjaminp · commit c629d51ea965 · 2010-06-11T21:53:07.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81906 | benjamin.peterson | 2010-06-11 16:40:37 -0500 (Fri, 11 Jun 2010) | 1 line

  different spellings are just unacceptable
........
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -1533,7 +1533,7 @@ static int
 symtable_visit_alias(struct symtable *st, alias_ty a)
 {
     /* Compute store_name, the name actually bound by the import
-       operation.  It is diferent than a->name when a->name is a
+       operation.  It is different than a->name when a->name is a
        dotted package name (e.g. spam.eggs)
     */
     PyObject *store_name;

Original file line number	Diff line number	Diff line change
`@@ -1533,7 +1533,7 @@ static int`
`1533`	`1533`	`symtable_visit_alias(struct symtable *st, alias_ty a)`
`1534`	`1534`	`{`
`1535`	`1535`	`/* Compute store_name, the name actually bound by the import`
`1536`		`- operation. It is diferent than a->name when a->name is a`
	`1536`	`+ operation. It is different than a->name when a->name is a`
`1537`	`1537`	`dotted package name (e.g. spam.eggs)`
`1538`	`1538`	`*/`
`1539`	`1539`	`PyObject *store_name;`