This is now in CVS.