(null merge 3.2, patch already applied to 3.3)
authorVictor Stinner <victor.stinner@haypocalc.com>
Fri, 1 Jul 2011 13:25:58 +0000 (15:25 +0200)
committerVictor Stinner <victor.stinner@haypocalc.com>
Fri, 1 Jul 2011 13:25:58 +0000 (15:25 +0200)

Trivial merge