K 10
svn:author
V 6
eadler
K 8
svn:date
V 27
2012-02-09T20:44:20.908992Z
K 7
svn:log
V 134
Make etc/Makefile more conflict resistant

PR:		conf/163789
Submitted by:	gcooper (iXsystems)
Approved by:	cperciva
MFC after:	3 days

END