From owner-svn-src-head@FreeBSD.ORG  Mon Nov 21 15:33:38 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2120A1065672;
	Mon, 21 Nov 2011 15:33:38 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 10BAE8FC15;
	Mon, 21 Nov 2011 15:33:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pALFXbVA048998;
	Mon, 21 Nov 2011 15:33:37 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pALFXbAV048995;
	Mon, 21 Nov 2011 15:33:37 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201111211533.pALFXbAV048995@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Mon, 21 Nov 2011 15:33:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227795 - head/cddl/contrib/opensolaris/cmd/zpool
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 15:33:38 -0000

Author: mm
Date: Mon Nov 21 15:33:37 2011
New Revision: 227795
URL: http://svn.freebsd.org/changeset/base/227795

Log:
  Fix mismerge in copyright of zpool(8).
  
  MFC after:	4 days

Modified:
  head/cddl/contrib/opensolaris/cmd/zpool/zpool.8

Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Mon Nov 21 15:26:20 2011	(r227794)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Mon Nov 21 15:33:37 2011	(r227795)
@@ -1,6 +1,5 @@
 '\" te
 .\" Copyright (c) 2004, 2010, Oracle and/or its
-.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved.
 .\" affiliates. All rights reserved.
 .\" The contents of this file are subject to the
 .\" terms of the Common Development and Distribution License (the "License").
@@ -12,6 +11,9 @@
 .\" If applicable, add the following below this CDDL HEADER, with the fields enclosed
 .\" by brackets "[]" replaced with your own identifying information: Portions
 .\" Copyright [yyyy] [name of copyright owner]
+.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved.
+.\" Portions Copyright 2011 Justin T. Gibbs <gibbs@FreeBSD.org>
+.\" Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org>
 .TH ZPOOL 8 "November 21, 2011" FreeBSD
 .SH NAME
 zpool \- configures ZFS storage pools