From owner-svn-src-all@FreeBSD.ORG  Sat Mar 13 22:37:07 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 66070106564A;
	Sat, 13 Mar 2010 22:37:07 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 553F08FC1B;
	Sat, 13 Mar 2010 22:37:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2DMb7IQ054488;
	Sat, 13 Mar 2010 22:37:07 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2DMb73k054486;
	Sat, 13 Mar 2010 22:37:07 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <201003132237.o2DMb73k054486@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Mar 2010 22:37:07 +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: r205137 - head/crypto/openssl/apps
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Mar 2010 22:37:07 -0000

Author: simon
Date: Sat Mar 13 22:37:07 2010
New Revision: 205137
URL: http://svn.freebsd.org/changeset/base/205137

Log:
  Readd $FreeBSD$ to the OpenSSL config file as that's useful for
  mergemaster.
  
  Suggested by:	dougb

Modified:
  head/crypto/openssl/apps/openssl.cnf

Modified: head/crypto/openssl/apps/openssl.cnf
==============================================================================
--- head/crypto/openssl/apps/openssl.cnf	Sat Mar 13 22:30:52 2010	(r205136)
+++ head/crypto/openssl/apps/openssl.cnf	Sat Mar 13 22:37:07 2010	(r205137)
@@ -1,3 +1,4 @@
+# $FreeBSD$
 #
 # OpenSSL example configuration file.
 # This is mostly being used for generation of certificate requests.