am 78f629e3: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ginger...
Eric Fischer [Fri, 29 Oct 2010 17:49:33 +0000 (10:49 -0700)]
* commit '78f629e3a511eb9795680ee2d7f7ef1c76b877c9':
  Import revised translations.  DO NOT MERGE


Trivial merge