am 41357ba8: am 02e731fb: merge -s ours from froyo-release so that upgrading...
am 41357ba8: am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '41357ba8'
* commit '41357ba8':
Import revised translations