Merge from 3.2 (change already committed in py3k)

This commit is contained in:
Éric Araujo 2011-08-26 16:39:26 +02:00
commit 811afe9b05

Diff Content Not Available