This is in CVS now.