From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Fri, 6 May 2011 09:17:40 +0000 (+0200)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~2389
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=136148e97d514291ac027dfb0c036f158fe47389;p=thirdparty%2FPython%2Fcpython.git

merge from 3.2
---

136148e97d514291ac027dfb0c036f158fe47389
diff --cc Misc/NEWS
index a67012656ec0,01274a11f85e..5cf9ac607572
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,6 -83,6 +140,10 @@@ Core and Builtin
  Library
  -------
  
++- Issue #10684: shutil.move used to delete a folder on case insensitive
++  filesystems when the source and destination name where the same except
++  for the case.
++
  - Issue #11647: objects created using contextlib.contextmanager now support
    more than one call to the function when used as a decorator. Initial patch
    by Ysj Ray.