Import of WPA supplicant 0.4.9
Import of hostapd 0.4.9
Import wpa_supplicant 0.5.8
Import hostapd 0.5.8
wpa-supplicant: remove version tag from directory
hostapd: remove version tag from directory
wpa_supplicant: update vendor branch to 0.6.10
hostapd: Update vendor branch to 0.6.10
hostapd vendor branch: Update version from 0.6.10 => 2.1
wpa_supplicant vendor branch: Update version 0.6.10 => 2.1
Removed copies of hostapd/wpa to prepare for branch merge

The contrib directories for hostapd and wpa_supplicant were just
copies of their respective vendor branches.  They were never merged
into the master branch.

To prepare for their first merging, let's remove the existing copies of
these two contrib subdirectories completely to avoid conflicts.

This is the first of four steps to update WPA Supplicant in base.
Step 2: Merge in hostapd and wpa_supplicant vendor branches (ver 2.1)
Step 3: Add local modifications to hostapd and wpa_supplicant
Step 4: Update makefile and conf files accordingly
Merge branch 'vendor/HOSTAPD'

Internally conflicted, use vendor/HOSTAPD in all cases
Merge branch 'vendor/WPA_SUPPLICANT'

Internally conflicted, use vendor/WPA_SUPPLICANT in all cases.
WPA Supplicant upgrade: Add local modifications and READMEs

Both vendor sources only need modification on a single file: wps_upnp.c
This is step 3 of 4 of the upgrade.
WPA Supplicant version upgrade complete: 0.6.10 => 2.1

This is step 4 of 4 of the process to upgrade WPA Supplicant and HostAPD
from version 0.6.10 (Dec 2010) to version 2.1 (Feb 2014).

  - Added hostapd.conf and wpa_supplicant.conf to etc
  - updated share/initrd/etc/wpa_supplicant.conf with the vendor
    version,
  - minors man fixes taken from FreeBSD head,
  - major Makefile overhaul in usr.sbin/802_11 based on FreeBSD head,
  - use the vendor's driver_wired and driver_bsd,
  - l2_packet.c is a copy of the vendor's l2_packet/l2_packet_freebsd.

All significant work contributed by: Alexandre Perrin <alex@kaworu.ch>
Thanks!
top: Fix -Sc option combination (bug #2670)

It was reported that the "top -S" and "top -c" commands work as expected
but "top -Sc" showed repeated lines.  I confirmed a malfunction, but a
different one: all 20 lines showing in console were the same.

The following patch will revert to standard format if a system command is
detected, otherwise the desired "full command" option is shown.

< http://bugs.dragonflybsd.org/issues/2670 >