CVS update by aidan xemacs/etc ...