Merge from CVS HEAD.