fixed #1635, merged changes to trunk, sorting all strings
Authored by: winterheart 2008-09-13
Parent: [r1812]
Child: [r1814]