#4147: merge with 3.2.

diff --cc Lib/test/test_minidom.py
Simple merge

diff --cc Misc/NEWS
index af8eaf463e0fd76d83cd007f2ccc00b678371a91,8a82b099ff85d09e1b0344a0da5128e071c8ed85..4bf4666721ae9ce163fc528c8861308d602eefb1
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -377,15 -76,10 +377,19 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #4147: minidom's toprettyxml no longer adds whitespace around a text
+   node when it is the only child of an element.  Initial patch by Dan
+   Kenigsberg.
+ 
 +- Issue #13374: The Windows bytes API has been deprecated in the os module. Use
 +  Unicode filenames instead of bytes filenames to not depend on the ANSI code
 +  page anymore and to support any filename.
 +
 +- Issue #13297: Use bytes type to send and receive binary data through XMLRPC.
 +
 +- Issue #6397: Support "/dev/poll" polling objects in select module,
 +  under Solaris & derivatives.
 +
  - Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly
    handles non-valid attributes, including adjacent and unquoted attributes.