Bug 940997: Reorganize primary controls in main menu. [r=mfinkle]
Bug 940997: Support showAsAction "ifRoom" in custom menu. [r=mfinkle]
Bug 940997: Remove icons from main menu. [r=mfinkle]