merge 3.2

benjaminp · benjaminp · commit ffada78059d9 · 2011-07-03T13:50:16.000-05:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -11,7 +11,7 @@ Core and Builtins
 -----------------
 
 - Issue #12475: Prevent generators from leaking their exception state into the
-  callers frame as they return for the last time.
+  caller's frame as they return for the last time.
 
 - Issue #12291: You can now load multiple marshalled objects from a stream,
   with other data interleaved between marshalled objects.
