Code

Merge v1.7.10-rc0 for git l10n update
authorJiang Xin <worldhello.net@gmail.com>
Thu, 8 Mar 2012 02:17:21 +0000 (10:17 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Thu, 8 Mar 2012 02:17:21 +0000 (10:17 +0800)

Trivial merge