2000-12-26  Jody Goldberg <jgoldberg@home.com>

	* src/item-cursor.c (cb_move_cursor) : fix old off by 1 error.

	* src/workbook-format-toolbar.c (workbook_format_toolbar)
	  merge/unmerge are not toggle items.

	* src/gnumeric.xml : Add entries for merge/unmerge.

	* s/MStyleBorder/StyleBorder/