K 10
svn:author
V 2
bz
K 8
svn:date
V 27
2016-06-06T14:05:54.500536Z
K 7
svn:log
V 167
MfH @r301508

Get some more "noise" out of the diff.   There should be more though.
Not sure why the merge did not pick this up.

Sponsored by:	The FreeBSD Foundation

END