Merge with 3.2 for Issue #19286.

diff --cc Misc/NEWS
index af7b994ae3b20a0b18faf458d9811fe133285a41,96e30ddef1f16d30d037764267248e5dc2e39d4f..ab1b98138a08214783ea0d05484d0cd98c2b9276
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,8 -10,53 +13,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #19286: Directories in ``package_data`` are no longer added to
+   the filelist, preventing failure outlined in the ticket.
+ 
  - Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler.
  
 -- Issue #14984: On POSIX systems, when netrc is called without a filename
 -  argument (and therefore is reading the user's $HOME/.netrc file), it now
 -  enforces the same security rules as typical ftp clients: the .netrc file must
 -  be owned by the user that owns the process and must not be readable by any
 -  other user.
 -
 -- Fix tkinter regression introduced by the security fix in issue #16248.
 -
 -- Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of
 -  service using certificates with many wildcards (CVE-2013-2099).
 -
 -
 -What's New in Python 3.2.5?
 -===========================
 -
 -*Release date: 13-May-2013*
 -
 -Library
 --------
 -
 -- Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of
 -  service using certificates with many wildcards (CVE-2013-2099).
 -
 -- Issue #17192: Restore the patch for Issue #11729 and Issue #10309
 -  which were omitted in 3.2.4 when updating the bundled version of
 -  libffi used by ctypes.
 -
 -- Issue #15535: Fix namedtuple pickles which were picking up the OrderedDict
 -  instead of just the underlying tuple.
 -
 -- Issue #1159051: Back out a fix for handling corrupted gzip files that
 -  broke backwards compatibility.
 -
 -- Issue #17915: Fix interoperability of xml.sax with file objects returned by
 -  codecs.open().
 -
 -Build
 ------
 -
 -- Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,
 -  such as was shipped with Centos 5 and Mac OS X 10.4.
 -
  Tests
  -----