Link traceroute6 to traceroute, thus completing the merge.
I was originally sent on this little errand by deraadt@.
OK sthen@, benno@
(Committing from a bus somewhere in germany on its way to berlin.)
Do you really want to build OpenSSL for 16-bit Windows? Well, we don't.

ok miod@
This is not FreeBSD.

ok miod@
Only remove queues from the TAILQ when the ticket changes; fixes PPS/BPS
displays for queues in "systat q". From Arto Jonsson.
fix whitespace
Kill the link to /usr/bin/page.  OK henning@ jmc@ miod@ schwarze@
KNF.
More KNF.
Allow to compile with DEBUG_PMAP defined.
Do not pass a NULL argument to OF_getprop(), even if it's fine for the
moment since we use an intermediate buffer and we specify a length of 0,
there's no need for an exception here.

Noticied while playing with the virtual-mode client interface of firmware.
sync
Replace all use of ERR_add_error_data with ERR_asprintf_error_data.
This avoids a lot of ugly gymnastics to do snprintfs before sending the
bag of strings to ERR, and eliminates at least one place in dso_dlfctn.c
where it was being called with the incorrect number of arguments and
using random things off the stack as addresses of strings.
ok krw@, jsing@
Get rid of duplication of the global lock code.  Allow recursion in all
code paths.

ok pirofti@
Appease gcc3 -Wuninitialized.
When the firmware has already allocated the handle we want to use to log in
to a port, restart the update process to keep things in sync.  Domain
controller logins get special handling here because they don't show up in the
list of logged in ports.
sync
transplant hotplug code over from qle(4)
Get back "_ppp" user and "_ppp" group.  From now they will be solely
used by npppd.

ok deraadt
Do not let the bluetooth HID device, present in Apple machines with USB,
grab the console.

This makes ddb(4) usable with any simple wired USB keyboard on G3/G4
machines that do not have adb(4) input devices, on G5s and certainly on
some MacBooks too.

ok andre@, miod@
Don't zap disklabel (and next 6 blocks) when installing boot block on
4k-sector disk drives.

Noted and fix tested by David Vasek via misc@

tweaks & ok jsing@