merge with 3.3

diff --cc Lib/modulefinder.py
Simple merge

diff --cc Misc/ACKS
index aa95d4dfb36df5984b799ddc575fa278639d5909,e4d178355af73b9f640f44371a8f0d217afc7242..90894a0020523c63c611f59d5dbc90b301389ef3
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -900,10 -894,6 +900,7 @@@ Dan Parisie
  William Park
  Harri Pasanen
  Gaël Pasgrimaud
- Berker Peksag
- Bo Peng
- Joe Peterson
 +Ashish Nitin Patil
  Randy Pausch
  Samuele Pedroni
  Justin Peel

diff --cc Misc/NEWS
Simple merge