Fri Aug 11 16:40:41 2000  George Lebl <jirka@5z.com>

	* gnome-panel-properties.c, panel_config_global.h, session.c,
	  menu-fentry.[ch]:  add a configuration option that can disable
	  menu merging.

	* menu.c:  Fix a crash on saving state of tornoff menus that point
	  at directories which have been reread