[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/a647e498e73a
changeset:   80116:a647e498e73a
parent:      80112:411d52192062
parent:      80115:28ce20fd9594
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Oct 31 14:16:22 2012 -0400
summary:
  merge 3.3

files:
  Misc/NEWS |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,7 +22,7 @@
   written by Serhiy Storchaka.
 
 - Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass
-  recieved a nonempty dict from the constructor.
+  received a nonempty dict from the constructor.
 
 - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a
   class's __dict__ and on type.

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