branches: 1.1.1.2.4; 1.1.1.2.10; 1.1.1.2.22;
Reimport Heimdal dist converted into NetBSD dist format. The prior
import did not catch all of the $Id$ tags because many of them are
unexpanded and the RE was only looking for expanded keywords.