From owner-cvs-src-old@FreeBSD.ORG  Tue May  4 11:25:18 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 82D821065673
	for <cvs-src-old@freebsd.org>; Tue,  4 May 2010 11:25:18 +0000 (UTC)
	(envelope-from nork@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 597D98FC1F
	for <cvs-src-old@freebsd.org>; Tue,  4 May 2010 11:25:18 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o44BPIN3091351
	for <cvs-src-old@freebsd.org>; Tue, 4 May 2010 11:25:18 GMT
	(envelope-from nork@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o44BPI9s091350
	for cvs-src-old@freebsd.org; Tue, 4 May 2010 11:25:18 GMT
	(envelope-from nork@repoman.freebsd.org)
Message-Id: <201005041125.o44BPI9s091350@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	nork@repoman.freebsd.org using -f
From: Norikatsu Shigemura <nork@FreeBSD.org>
Date: Tue, 4 May 2010 11:25:04 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 May 2010 11:25:18 -0000

nork        2010-05-04 11:25:04 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 207612 on 2010-05-04 11:25:04Z by nork
  
  Add support run services_mkdb(8).
  
  Approved by:    dougb, imp (mentor)
  Reviewed by:    ume
  MFC after:      2 weeks
  
  Revision  Changes    Path
  1.85      +14 -0     src/usr.sbin/mergemaster/mergemaster.sh