Backed out changeset d5a62078b4f2 (bug 945191) for commit msg without 'Australis'
Bug 945191 - Australis' combined buttons show wrong context menu options when they are in the toolbar. r=Gijs, DONTBUILD