From owner-cvs-src@FreeBSD.ORG  Sat May 10 18:43:57 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B592C106564A;
	Sat, 10 May 2008 18:43:57 +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 8B6F98FC28;
	Sat, 10 May 2008 18:43:57 +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 m4AIhv7k063286;
	Sat, 10 May 2008 18:43:57 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4AIhvpK063285;
	Sat, 10 May 2008 18:43:57 GMT (envelope-from rwatson)
Message-Id: <200805101843.m4AIhvpK063285@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 10 May 2008 18:43:57 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_7
Cc: 
Subject: cvs commit: src Makefile
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 May 2008 18:43:57 -0000

rwatson     2008-05-10 18:43:57 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    .                    Makefile 
  Log:
  Merge Makefile:1.348 from HEAD to RELENG_7:
  
    Mention -U and -ai arguments to mergemaster in a comment for the
    general mergemaster line.
  
    Suggested by:   Ben Laurie
  
  Revision   Changes    Path
  1.341.2.3  +1 -1      src/Makefile