fixed minor merge typo.
fixed minor merge typo.

AdrianGaudebert/elmo,mozilla/elmo,mozilla/elmo,AdrianGaudebert/elmo,Pike/elmo,AdrianGaudebert/elmo,Pike/elmo,mozilla/elmo,mozilla/elmo,Pike/elmo,Pike/elmo