trunk: Ported Python 2.6 fixes from 0.11-stable ([7774], [7775]).
Authored by: jonas 2009-01-01
Parent: [r7775]
Child: [r7777]