Merged r4611 from trunk (Mercurial sorting).
Authored by: tmaruyama 2011-01-02
Parent: [r4611]
Child: [r4613]