CVS update by ben xemacs/src ...