carbon2-commit: Automated merge with file:///Sources/xemacs-21.5-checked-out