Merge 3.2

diff --cc Lib/xmlrpc/server.py
Simple merge

diff --cc Misc/NEWS
index 4b18715aace801dbe3a75f9f1c2a6f7f3bac8472,250dd81fd9dd6172a4c9d19a0a5a5aaa5bb6eb91..e2455c80e2ca99326f1ae814d595a7b58fd5b9cb
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,26 -2,10 +2,28 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.2.3 release candidate 1?
 -===============================================
 +What's New in Python 3.3.0 Alpha 2?
 +===================================
  
 -*Release date: 24-Feb-2011*
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +Library
 +-------
 +
++- Issue #13719: Make the distutils upload command aware of bdist_msi products.
++
 +- Issue #14007: Accept incomplete TreeBuilder objects (missing start, end,
 +  data or close method) for the Python implementation as well.
 +  Drop the no-op TreeBuilder().xml() method from the C implementation.
 +
 +
 +What's New in Python 3.3.0 Alpha 1?
 +===================================
 +
 +*Release date: 05-Mar-2012*
  
  Core and Builtins
  -----------------