[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/874739f36be8
changeset:   72211:874739f36be8
parent:      72207:1ed1ea0f4cd8
parent:      72210:ce136cdbc57e
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Fri Sep 02 21:24:55 2011 +0200
summary:
  merge with 3.2

files:
  Doc/ACKS.txt |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -226,6 +226,7 @@
    * Collin Winter
    * Blake Winton
    * Dan Wolfe
+   * Adam Woodbeck
    * Steven Work
    * Thomas Wouters
    * Ka-Ping Yee

-- 
Repository URL: http://hg.python.org/cpython