Merged from mwolson@gnu.org--2006-muse-el/muse-el--devel--0 (patch 170)