0.12dev: ported unicode fix r7929 from 0.11-stable
Authored by: cboos 2009-03-04
Parent: [r7931]
Child: [r7933]