unicode: synched branch with trunk@... and fixed #2394.
Authored by: jonas 2006-03-09
Parent: [r2979]
Child: [r2981]