CVS update by stephent xemacs ...