Due to a last minute change in the #ifdefing in malloc.h before committing,
a nested include of param.h is required so that MAXCPU is visible to all
consumers of sys/malloc.h.  In an earlier version of the patch, the
malloc_type_internal structure was only conditionally visible.

Pointed out by:	delphij
Chop a '>' in a feature name (RSVD2>) that snuck in;
this now balances the <> flags displayed at boot, e.g. without this
Features2=0x41d<SSE3,RSVD2>,MON,DS_CPL,CNTX-ID>

MFC after:	1 week
This commit was generated by cvs2svn to compensate for changes in r146768,
which included commits to RCS files with non-trunk default branches.
resolve merge conflicts

Reviewed by:	bms (earlier version)
update for import of v0.9.1-096
This commit was generated by cvs2svn to compensate for changes in r146773,
which included commits to RCS files with non-trunk default branches.
This commit was generated by cvs2svn to compensate for changes in r146775,
which included commits to RCS files with non-trunk default branches.
resolve merge conflicts and update for proper build; including:

o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h

Reviewed by:	bms
update after import of v3.9.1-096

Reviewed by:	bms
bump version for libpcap (+tcpdump) import
Hand it to spaff, he knows how to say it:

Using encryption on the Internet is the equivalent of arranging
an armoured car to deliver credit card information from someone
living in a cardboard box to someone living on a park bench.
		-- Gene Spafford, Purdue University.
Add a new field, sy_auevent, to the system call entry description
structure, sysent.  This field will hold the default audit event
to generate when the system call is entered.  Currently, it will
default to 0 due to allocation in bss.

Submitted by:	wsalamon
Obtained from:	TrustedBSD Project
Normalize white space in syscalls.master: try to use tabs before system
call types.
Add missed ${.CURDIR}/../../contrib/bzip2 into include search path, otherwise
old version of bzlib.h can be picked up from the /usr/include.
White space normalization: use tabs instead of spaces before and after
the system call type field.
Catch up with s/dev_t/struct cdev */.
Eliminate aio_bufjobs; it's unused.
Make bzip2 support working again after bzip2 upgrade. This time commit
BZ_NO_COMPRESS support to the bzip2 sources directly (yes, this takes file
off the vendor branch, but looks like bzip2 maintainer doesn't care), so that
it will not be removed when the next upgrade is performed. Also, add a short
note on how to test bzip2 support.

Pointy hat to:  obrien

Correct comment (libz -> libbz2) and remove useless full path to zutil.h
while I am here.
o  Call cninit_finish() in configure_final().
o  Remove unused and compiled-out code while here.
Call cninit_finish() and set cold to 0 in configure_final() instead
of in configure(). Call cninit_finish() before setting cold to 0.
This is how it's done for other platforms. Be alike to avoid problems.