K 10 svn:author V 3 dfr K 8 svn:date V 27 2007-06-30T07:47:45.000000Z K 7 svn:log V 59 Merge fixes back from heimdal. Approved by: re (kensmith) END