From owner-cvs-all@FreeBSD.ORG  Sun Jul 22 12:20:43 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0CDC916A468;
	Sun, 22 Jul 2007 12:20:43 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DC11513C480;
	Sun, 22 Jul 2007 12:20:42 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6MCKgqe059801;
	Sun, 22 Jul 2007 12:20:42 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6MCKgUF059800;
	Sun, 22 Jul 2007 12:20:42 GMT (envelope-from rwatson)
Message-Id: <200707221220.l6MCKgUF059800@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 22 Jul 2007 12:20:42 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/contrib/openbsm/etc audit_event
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2007 12:20:43 -0000

rwatson     2007-07-22 12:20:42 UTC

  FreeBSD src repository

  Modified files:
    contrib/openbsm/etc  audit_event 
  Log:
  Resolve conflicts from import of OpenBSM 1.0 alpha15 ($FreeBSD$/$P4$
  conflict).
  
  Approved by:    re (hrs)
  
  Revision  Changes    Path
  1.8       +59 -13    src/contrib/openbsm/etc/audit_event