Sam Leffler writes:

>>       i looked at the diff between netipsec/key* and netkey/key*.
>>       the changes are minimal.  i will remove the former and put #ifdef
>>       FAST_IPSEC into the former.

>I'm not sure this is a good idea.  I intentionally duplicated all KAME code 
>because I intended to change it significantly.  (I also wanted to insure 
>neither code base affected the other.)
>
>In this case I'm close to working on the PF_KEY implementation s.t. it will 
>diverge from the KAME implementation.  If netbsd wants to track this work 
>then doing the above will be wasted effort.

I *do* wish to track that work.  Therefore, please undo the
unwarranted merge and CVS removes.