Updated to apply to latest CVS source.