null merge 3.2 (patch already applied to 3.3)

This commit is contained in:
Victor Stinner 2011-06-10 16:38:38 +02:00
commit ff9b5c76ab

Diff content is not available