Code

Merge v1.7.10-rc0 for git l10n update
authorJiang Xin <worldhello.net@gmail.com>
Fri, 16 Mar 2012 12:18:07 +0000 (20:18 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Fri, 16 Mar 2012 12:18:07 +0000 (20:18 +0800)

Trivial merge