Index: stable/9/usr.sbin/Makefile
===================================================================
--- stable/9/usr.sbin/Makefile	(revision 254965)
+++ stable/9/usr.sbin/Makefile	(revision 254966)

Property changes on: stable/9/usr.sbin/Makefile
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/usr.sbin/Makefile:r238438
Index: stable/9/usr.sbin/bsdconfig
===================================================================
--- stable/9/usr.sbin/bsdconfig	(revision 254965)
+++ stable/9/usr.sbin/bsdconfig	(revision 254966)

Property changes on: stable/9/usr.sbin/bsdconfig
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/usr.sbin/bsdconfig:r238438,238444,240518,240684,240768,240770,240783,240797-240798,240843,240863,241019,241042,241149,241330,241499,241653,241673,241700-241701,241899,242096,242107,242114-242115,242117-242119,242123,243112,243475-243476,243504,243634-243636,244548,244550,244554-244556,244558,244563,244565,244674-244675,244727,244797-244799,244801-244802,244804,244994,245052,245106,245116-245117,245401-245402,245437,245695,246546,247278,247280,249094,249746,249749,249751,249753-249759,249779-249781,249783,249823,249827,249954-249955,250317-250323,250410,250535-250539,250633,250701-250702,251190,251232-251233,251236,251242,251244,251264-251278,251353-251355,251357,251361-251364,251389-251390,251540-251545,251547,251549,251552-251557,251579,251613,251758,251793,251904-251915,251919,251926,251928,251930,251933,251965,251967,251972,251974-251975,251977-251981,251996-251997,252000-252002,252017-252020,252022,252075-252079,252081-252086,252109-252110,252112-252113,252177-252178,252721,252737-252738,252740-252746,252753,252771-252775,252795,252801-252811,252813,252815-252817,252822,252833-252834,252836,252842,252844,252848-252849,252853,252980,252982,252987,253117-253118,253121,253175,253333
Index: stable/9/usr.sbin
===================================================================
--- stable/9/usr.sbin	(revision 254965)
+++ stable/9/usr.sbin	(revision 254966)

Property changes on: stable/9/usr.sbin
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/usr.sbin:r238438