Index: user/ngie/more-tests2/sbin
===================================================================
--- user/ngie/more-tests2/sbin	(revision 289300)
+++ user/ngie/more-tests2/sbin	(revision 289301)

Property changes on: user/ngie/more-tests2/sbin
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sbin:r289226-289228
Index: user/ngie/more-tests2/share
===================================================================
--- user/ngie/more-tests2/share	(revision 289300)
+++ user/ngie/more-tests2/share	(revision 289301)

Property changes on: user/ngie/more-tests2/share
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/share:r289226-289227
Index: user/ngie/more-tests2/sys
===================================================================
--- user/ngie/more-tests2/sys	(revision 289300)
+++ user/ngie/more-tests2/sys	(revision 289301)

Property changes on: user/ngie/more-tests2/sys
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys:r289228
Index: user/ngie/more-tests2
===================================================================
--- user/ngie/more-tests2	(revision 289300)
+++ user/ngie/more-tests2	(revision 289301)

Property changes on: user/ngie/more-tests2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r289197,289223