CVS update by michaels xemacs ...