Merged with CVS v2.1