am 570e7bd9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 22 Aug 2013 17:40:14 +0000 (10:40 -0700)]
* commit '570e7bd90439cee763e776334313d132681c35d4':
  Import translations. DO NOT MERGE


Trivial merge