Fixed bug introduced by utf-8 patch with fix provided by Henry Ludemann. All unit tests are now passing.
Authored by: blep 2009-11-18
Parent: [r71]
Child: [r73]
