restore sort before merging trunk back in.
Authored by: jimwinston 2010-05-06
Parent: [r781]
Child: [r783]