OpenPAM Micrampelis was re-rolled due to a showstopper bug.
Merge upstream r634:646: correctly parse mixed quoted / unquoted text.
See http://www.openpam.org/wiki/Errata#Configurationparsing for details.
Pull in a patchset from upstream to silence spurious "no such identity
file" warnings.
Apply a patch from OpenSSH bugzilla #2057 to silence "received disconnect"
errors in the common case (i.e. client intentionally disconnected).
The previous commit missed part of the patch.  Re-apply.
Vendor import of OpenSSH 6.2p2.
Import bmake-20130604
Tag bmake-20130604
As per the developers handbook (5.3.1 step 1), prepare the vendor trees for
import of new ipfilter vendor sources by flattening them.

To keep the tags consistent with dist, the tags are also flattened.

Approved by:	glebius (Mentor)
As per the developers handbook (5.3.1 step 1), prepare the vendor trees for
import of new ipfilter vendor sources by flattening them.

To keep the tags consistent with dist, the tags are also flattened.

Approved by:	glebius (Mentor)
In preparation for the upcoming ipfilter vendor code import,
disable keyword expansion as per developers handbook (5.3.1 step 1).
It makes no sense on unmodified vendor code.

Approved by:	glebius (Mentor)
In preparation for the upcoming ipfilter vendor code import,
disable keyword expansion as per developers handbook (5.3.1 step 1).
It makes no sense on unmodified vendor code.

Approved by:	glebius (Mentor)
Import bmake-20130730 - allows folk to supress job tokens.
Tag bmake-20130730
Import IP-Filter 5.1.2 into vendor branches using the existing license that
the current version of IP-Filter in FreeBSD is under as per email received
from Darren Reed on Mon, 08 Jul 2013 23:54:16 +1000.

Approved by:	glebius (Mentor), Darren Reed <darrenr@reed.wattle.id.au>
Import IP-Filter 5.1.2 into vendor branches using the existing license that
the current version of IP-Filter in FreeBSD is under as per email received
from Darren Reed on Mon, 08 Jul 2013 23:54:16 +1000.

Approved by:	glebius (Mentor), Darren Reed <darrenr@reed.wattle.id.au>
Apply upstream revision 1.151 (fix relative symlinks)
Include three new files that should be in vendor-sys branch too.

Approved by:	glebius (Mentor)
Document the FreeBSD use of IP-FIlter under the previously existing non-GPL
license.

Approved by:	Darren Reed <darrenr@reed.wattle.id.au> (IP-Filter author)
		glebius (mentor)
Revert to the previous IP-Filter license which was inadvertently overwritten
by the new GPL license for IP-Filter.
`
Document the FreeBSD use of IP-FIlter under the previously existing non-GPL
license.

Approved by:	Darren Reed <darrenr@reed.wattle.id.au> (IP-Filter author)
		glebius (mentor)