am ad3677ae: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ginger...
Eric Fischer [Wed, 27 Oct 2010 18:03:52 +0000 (11:03 -0700)]

Trivial merge