CVS #2342