Re: Sync upstream and XEmacs package