Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Wed, 27 Oct 2010 17:58:48 +0000 (10:58 -0700)]

Trivial merge