merge with CVS v2.2