CVS update by ben xemacs/man ...