Merge fix for issue #11450

diff --cc Misc/NEWS
index 9d6ed3a10fd37cc0b01e047d03451dc926e982fa,727816135507240465cfc349b07b5c3b31cdfd61..dc4f63e4f15380d82bc4a8c821d43f60b0bb6765
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,19 -10,9 +10,22 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when
+   there are many tags (e.g. when using mq).  Patch by Nadeem Vawda.
+ 
 +- Issue #11335: Fixed a memory leak in list.sort when the key function
 +  throws an exception.
 +
 +- Issue #8923: When a string is encoded to UTF-8 in strict mode, the result is
 +  cached into the object. Examples: str.encode(), str.encode('utf-8'),
 +  PyUnicode_AsUTF8String() and PyUnicode_AsEncodedString(unicode, "utf-8",
 +  NULL).
 +
 +- Issue #10831: PyUnicode_FromFormat() supports %li, %lli and %zi formats.
 +
 +- Issue #10829: Refactor PyUnicode_FromFormat(), use the same function to parse
 +  the format string in the 3 steps, fix crashs on invalid format strings.
 +
  - Issue #11246: Fix PyUnicode_FromFormat("%V") to decode the byte string from
    UTF-8 (with replace error handler) instead of ISO-8859-1 (in strict mode).
    Patch written by Ray Allen.

diff --cc Modules/getbuildinfo.c
Simple merge