CVS #6079