CVS #6094