CVS update by ben xemacs ...