svn commit: r208521 - in stable/8/cddl/contrib/opensolaris: . cmd/zdb cmd/zfs lib/libzfs

[Xin LI]

Author: delphij
Date: Mon May 24 19:56:33 2010
New Revision: 208521
URL: http://svn.freebsd.org/changeset/base/208521

Log:
  Correct svn:mergeinfo so that they are at the right places.
  
  To quote pjd@:
  
  The proper merge points are:
  
  	cddl/contrib/opensolaris
  	cddl/compat/opensolaris

Modified:
Directory Properties:
  stable/8/cddl/contrib/opensolaris/   (props changed)
  stable/8/cddl/contrib/opensolaris/cmd/zdb/   (props changed)
  stable/8/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  stable/8/cddl/contrib/opensolaris/lib/libzfs/   (props changed)