darrenr 729f0dc597 fix conflicts from import

1997-07-05 05:38:14 +00:00

..

ipnat.4

…

ipnat.5

…

ipnat.8

…

ipnat.c

fix conflicts from import

1997-07-05 05:38:14 +00:00

Makefile

fix conflicts from import

1997-07-05 05:38:14 +00:00