am b78a314c: (-s ours) am fe110beb: Import translations. DO NOT MERGE
Eric Fischer [Mon, 5 Mar 2012 21:42:53 +0000 (13:42 -0800)]
* commit 'b78a314cdde7de983ce7a8e9e0c29b8553a92d51':
  Import translations. DO NOT MERGE


Trivial merge