add this to trunk while we're on the way to 2.7rc1. When fixed this can go into py3k first. Sorry.
Attach a file by drag & drop or click to upload
