CVS update by vins MODIFIED: xemacs/etc ...