Merge branch 'master' of git.chise.org:chise/xemacs-chise