heimdal: import heimdal's trunk svn rev 23697 + lorikeet-heimdal patches