Adapt to CVS version as of 2006-09-23.