CVS update by malcolmp xemacs/etc ...