Merge from CheriBSD:
commit7957d0e660e69bd62f1485b7360eba22cd778ab6
authorbrooks <brooks@FreeBSD.org>
Thu, 30 Jan 2014 22:26:51 +0000 (30 22:26 +0000)
committerbrooks <brooks@FreeBSD.org>
Thu, 30 Jan 2014 22:26:51 +0000 (30 22:26 +0000)
tree704de8111547c9b283636b22777e0128433c7f1c
parent0a07d9ce6d7695e0b79bda59f51c5ec42b73d1a5
Merge from CheriBSD:
commit 1b41f6de7ca09e04fdc6f66bc478ea6c981a41b9
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date:   Mon Jan 27 22:59:02 2014 +0000

    Now that mtree is always nmtree use it as mtree

Tested on: ref9-amd64
X-MFC after: never
Sponsored by: DARPA, AFRL
Makefile.inc1