Merged from mwolson@gnu.org--2006-muse-el (patch 95-96)