Fix the locale bug
Fix the locale bug
Merge branch 'master' of git://github.com/xiangcai/todother