#16306: merge with 3.2.

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

diff --cc Misc/ACKS
index abf4a5ddc6782d362d43f6621bf23f544bf7b3bd,1f51fbd551cd73d22803c684fd3394e89c10fb57..ced316890b1667fd0fccd86fdb4ce2025a821a4d
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -835,9 -757,9 +835,10 @@@ Trent Nelso
  Chad Netzer
  Max Neunhöffer
  George Neville-Neil
+ Hieu Nguyen
  Johannes Nicolai
  Samuel Nicolary
 +Jonathan Niehof
  Gustavo Niemeyer
  Oscar Nierstrasz
  Hrvoje Niksic

diff --cc Misc/NEWS
index 0cf165eb308a916b95cf1d7d87dee452be16f88c,c8580e33cb0ff3c746bd2ce93a876fa24f0acdca..9771ecd5a36500a13c83c597510d23806d1a751a
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -12,9 -10,9 +12,12 @@@ What's New in Python 3.3.1
  Core and Builtins
  -----------------
  
+ - Issue #16306: Fix multiple error messages when unknown command line
+   parameters where passed to the interpreter.  Patch by Hieu Nguyen.
+ 
 +- Issue #16215: Fix potential double memory free in str.replace().  Patch
 +  by Serhiy Storchaka.
 +
  - Issue #16453: Fix equality testing of dead weakref objects.
  
  - Issue #9535: Fix pending signals that have been received but not yet