- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Update ipfilter 4.1.28 --> 5.1.2.

Approved by: glebius (mentor)
BSD Licensed by: Darren Reed <darrenr@reed.wattle.id.au> (author)

Remove unneeded include of <sys/timeb.h>.

This header file should not be included by anything.

Remove udp and tcp includes not needed here.

Tripped over by: a compile of an upcoming change
MFC after: 1 month

Resolve conflicts

MFC after: 1 weeks

Resolve conflicts (and believe me...you don't want to know).

* Someone imported a lot of files with the wrong CVS tag, so lots of files need
that fixed in them....
* Keep unnecessary files out of the non-vendor part of this CVS repository.

fix conflicts generated by import, completing import of ipf3.4.25

fix conflicts created by import

Not in this commit: Many spammed deltas have been removed to restore
back to the vendor branch.

Re-merge changes from the vendor branch.

Undo the local spammed changes that I could find. There are probably
more local fixes that were clobbered that I've missed.

Some tweaks to get this to compile for the userland tools.

This commit was generated by cvs2svn to compensate for changes in r31183,
which included commits to RCS files with non-trunk default branches.

Import ipfilter 3.2.1 (update from 3.1.8)

Import IP Filter version 3.2alpha4 to bring in working LKM for 2.2

Import IP Filter v3.1.7 into FreeBSD tree