CVS update by aidan xemacs/man ...