From: R David Murray <rdmurray@bitdance.com>
Date: Thu, 10 Mar 2011 22:38:50 +0000 (-0500)
Subject: Merge #10999 fix.
X-Git-Tag: v3.3.0a1~2963^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee30a0be35d15146ec78f3859df2d63fbee323b8;p=thirdparty%2FPython%2Fcpython.git

Merge #10999 fix.
---

ee30a0be35d15146ec78f3859df2d63fbee323b8
diff --cc Misc/ACKS
index 36555d2d0761,02882c6c5c64..1dc406342ff1
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -622,7 -619,7 +622,8 @@@ Stefan Norber
  Tim Northover
  Joe Norton
  Neal Norwitz
+ Michal Nowikowski
 +Steffen Daode Nurpmeso
  Nigel O'Brian
  Kevin O'Connor
  Tim O'Malley