CVS update by stephent xemacs/etc ...