am 5f587436: (-s ours) am a3c9f66a: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 5 Aug 2010 18:45:13 +0000 (11:45 -0700)]
Merge commit '5f587436aad18acc3bbf6577872cc80b0af980d2'

* commit '5f587436aad18acc3bbf6577872cc80b0af980d2':
  Import revised translations.  DO NOT MERGE


Trivial merge