CVS update by adrian xemacs/man ...