Merged from mwolson@gnu.org--2006/muse--main--1.0 (patch 279-280)