CVS update by james xemacs ...