* apply the CVS_Username patch into CVS mainline