Merged from mwolson@gnu.org--2006/muse--rel--3.03 (patch 5-6)