From: Richard Oudkerk <shibturn@gmail.com>
Date: Wed, 13 Feb 2013 15:25:21 +0000 (+0000)
Subject: Merge
X-Git-Tag: v3.4.0a1~1378
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0bf84c84bff4e635501319e6d6bfa141c59b41e;p=python

Merge
---

f0bf84c84bff4e635501319e6d6bfa141c59b41e
diff --cc Misc/NEWS
index 409b1e6c96,185e14d55a..199fd8f36a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -253,9 -178,8 +253,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #16743: Fix mmap overflow check on 32 bit Windows.
+ 
 +- Issue #16996: webbrowser module now uses shutil.which() to find a
 +  web-browser on the executable search path.
 +
  - Issue #16800: tempfile.gettempdir() no longer left temporary files when
    the disk is full.  Original patch by Amir Szekely.