Index: stable/7/sys
===================================================================
--- stable/7/sys	(revision 235783)
+++ stable/7/sys	(revision 235784)

Property changes on: stable/7/sys
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys:r235634