merge with 3.2
authorGeorg Brandl <georg@python.org>
Sun, 25 Dec 2011 18:03:22 +0000 (19:03 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 25 Dec 2011 18:03:22 +0000 (19:03 +0100)
commit1e66f56d098b3c7e054dd3d623c5be901120f805
tree225f63bb4e7708f666e01a2e2acda8da40a46915
parent54af1ba32616eb4357985e5d38a72d23d356b7b9
parent1532c8f9a737c4ae03b5b759ad7b80b1808ec326
merge with 3.2