2015-08-07 - releng
18:50	<bd808>	updated scap: removed cherry-pick of I3d2b4e7 and updated to latest HEAD	[releng]