From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 15 May 2012 14:42:11 +0000 (+0800)
Subject: merge heads
X-Git-Tag: v3.3.0a4~155^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=acfc26acb0dff670f68a59c82762e21e81cc7fb0;p=python

merge heads
---

acfc26acb0dff670f68a59c82762e21e81cc7fb0
diff --cc Misc/NEWS
index 009d8e6923,0e369030fd..c79713fa68
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -31,9 -31,8 +31,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue 14773: Fix os.fwalk() failing on dangling symlinks.
+ 
 +- Issue #12541: Be lenient with quotes around Realm field of HTTP Basic
 +  Authentation in urllib2.
 +
  - Issue 14807: move undocumented tarfile.filemode() to stat.filemode() and add
    doc entry. Add tarfile.filemode alias with deprecation warning.