K 10
svn:author
V 6
mlaier
K 8
svn:date
V 27
2005-05-03T16:43:32.000000Z
K 7
svn:log
V 244
Resolve conflicts created during the import of pf 3.7 Some features are
missing and will be implemented in a second step.  This is functional as is.

Tested by:	freebsd-pf, pfsense.org
Obtained from:	OpenBSD
X-MFC after:	never (breaks API/ABI)

END