Integrate changes for CEDET and menu bar.