merge 3.3 (bug already fixed, differently, in default)

This commit is contained in:
Victor Stinner 2012-10-05 00:37:11 +02:00
commit d4b5aaa9a9

Diff Content Not Available