CVS problems: how to put xemacs-20 and xemacs-packages together?