commit: Automated merge with ssh://aidan-guest@hg.debian.org//hg/xemacs/xemacs