am a270bd59: Merge "fix a long-standing \'typo\' bug" into honeycomb

* commit 'a270bd59a8e6d291af8c1cfcf13af5260ec0ed5a':
  fix a long-standing 'typo' bug